diff --git a/rudof_lib/src/lib.rs b/rudof_lib/src/lib.rs
index bce6a1b6..a562a1a9 100644
--- a/rudof_lib/src/lib.rs
+++ b/rudof_lib/src/lib.rs
@@ -6,11 +6,11 @@ pub mod rudof;
 pub mod rudof_config;
 pub mod rudof_error;
 pub mod shapes_graph_source;
+pub use oxrdf;
 pub use rudof::*;
 pub use rudof_config::*;
 pub use rudof_error::*;
+pub use shacl_ast;
+pub use shacl_validation;
 pub use shapes_graph_source::*;
 pub use srdf;
-pub use shacl_validation;
-pub use shacl_ast;
-pub use oxrdf;
diff --git a/rudof_lib/src/rudof.rs b/rudof_lib/src/rudof.rs
index c315a208..72a75748 100644
--- a/rudof_lib/src/rudof.rs
+++ b/rudof_lib/src/rudof.rs
@@ -27,9 +27,7 @@ pub use shapemap::{QueryShapeMap, ResultShapeMap, ShapeMapFormat, ValidationStat
 pub use shex_compact::{ShExFormatter, ShapeMapParser, ShapemapFormatter as ShapeMapFormatter};
 pub use shex_validation::Validator as ShExValidator;
 pub use shex_validation::{ShExFormat, ValidatorConfig};
-pub use srdf::{
-    QuerySolution, QuerySolutions, RDFFormat, ReaderMode, SRDFSparql, VarName,
-};
+pub use srdf::{QuerySolution, QuerySolutions, RDFFormat, ReaderMode, SRDFSparql, VarName};
 pub type Result<T> = result::Result<T, RudofError>;
 pub use shacl_ast::ast::Schema as ShaclSchema;
 pub use shapes_converter::UmlGenerationMode;
diff --git a/shacl_testsuite/data-shapes b/shacl_testsuite/data-shapes
index ff9edb9c..e0133985 160000
--- a/shacl_testsuite/data-shapes
+++ b/shacl_testsuite/data-shapes
@@ -1 +1 @@
-Subproject commit ff9edb9c85375498b49391fb65ef3ff6525ebe08
+Subproject commit e01339850d0eb2d36237cd87919215cc8dede1a0
diff --git a/shacl_validation/src/focus_nodes.rs b/shacl_validation/src/focus_nodes.rs
index 144e050d..76bbd2a0 100644
--- a/shacl_validation/src/focus_nodes.rs
+++ b/shacl_validation/src/focus_nodes.rs
@@ -10,6 +10,10 @@ impl<S: SRDFBasic> FocusNodes<S> {
         Self(HashSet::from_iter(iter))
     }
 
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
     pub fn len(&self) -> usize {
         self.0.len()
     }
diff --git a/srdf/src/shacl_path.rs b/srdf/src/shacl_path.rs
index 4a8ab9a2..4819d285 100644
--- a/srdf/src/shacl_path.rs
+++ b/srdf/src/shacl_path.rs
@@ -23,7 +23,7 @@ impl SHACLPath {
     pub fn pred(&self) -> Option<&IriS> {
         match self {
             SHACLPath::Predicate { pred } => Some(pred),
-            _ => None
+            _ => None,
         }
     }
 }