diff --git a/inspector-vc/src/test/java/org/oneedtech/inspect/vc/OB20Tests.java b/inspector-vc/src/test/java/org/oneedtech/inspect/vc/OB20Tests.java
index f927171..2394592 100644
--- a/inspector-vc/src/test/java/org/oneedtech/inspect/vc/OB20Tests.java
+++ b/inspector-vc/src/test/java/org/oneedtech/inspect/vc/OB20Tests.java
@@ -132,21 +132,24 @@ public class OB20Tests {
 				Samples.OB20.JSON.RDF_VALIDATION_VALID_ISSUER_EXTENSION_CLASS,
 				Samples.OB20.JSON.RDF_VALIDATION_VALID_ALIGNMENT_OBJECT,
 				Samples.OB20.JSON.RDF_VALIDATION_VALID_EXTERNAL_CLASS,
-				Samples.OB20.JSON.RDF_VALIDATION_INVALID_EMPTY_CLASS,
-				Samples.OB20.JSON.RDF_VALIDATION_INVALID_CLASS,
-				Samples.OB20.JSON.RDF_VALIDATION_INVALID_ELEM_CLASS,
-				Samples.OB20.JSON.RDF_VALIDATION_INVALID_ISSUER_TYPE,
 				Samples.OB20.JSON.RDF_VALIDATION_VALID_EMPTY_CRITERIA_TYPE).forEach(resource -> {
 			assertDoesNotThrow(()->{
 				Report report = validator.run(resource.asFileResource());
 				if(verbose) PrintHelper.print(report, true);
-				if(resource.isValid()) {
-					assertValid(report);
-				} else {
-					assertInvalid(report);
-				}
+				assertValid(report);
 			});
 		});
+		List.of(Samples.OB20.JSON.RDF_VALIDATION_INVALID_EMPTY_CLASS,
+				Samples.OB20.JSON.RDF_VALIDATION_INVALID_CLASS,
+				Samples.OB20.JSON.RDF_VALIDATION_INVALID_ELEM_CLASS,
+				Samples.OB20.JSON.RDF_VALIDATION_INVALID_ISSUER_TYPE).forEach(resource -> {
+			assertDoesNotThrow(()->{
+				Report report = validator.run(resource.asFileResource());
+				if(verbose) PrintHelper.print(report, true);
+				assertInvalid(report);
+			});
+		});
+
 	}
 
 	@Test
diff --git a/inspector-vc/src/test/java/org/oneedtech/inspect/vc/Samples.java b/inspector-vc/src/test/java/org/oneedtech/inspect/vc/Samples.java
index f873f19..5412da7 100644
--- a/inspector-vc/src/test/java/org/oneedtech/inspect/vc/Samples.java
+++ b/inspector-vc/src/test/java/org/oneedtech/inspect/vc/Samples.java
@@ -64,16 +64,17 @@ public class Samples {
 			public final static Sample RDF_VALIDATION_VALID_ISSUER_EXTENSION_CLASS = new Sample("ob20/rdf-validation/valid-issuer-extension.json", true);
 			public final static Sample RDF_VALIDATION_VALID_ALIGNMENT_OBJECT = new Sample("ob20/rdf-validation/valid-alignment-object.json", true);
 			public final static Sample RDF_VALIDATION_VALID_EXTERNAL_CLASS = new Sample("ob20/rdf-validation/valid-cool-class.json", true);
-			public final static Sample RDF_VALIDATION_INVALID_CLASS = new Sample("ob20/rdf-validation/invalid-class.json", false);
-			public final static Sample RDF_VALIDATION_INVALID_EMPTY_CLASS = new Sample("ob20/rdf-validation/invalid-empty-type.json", false);
-			public final static Sample RDF_VALIDATION_INVALID_ELEM_CLASS = new Sample("ob20/rdf-validation/invalid-one-invalid-class.json", false);
-			public final static Sample RDF_VALIDATION_INVALID_ISSUER_TYPE = new Sample("ob20/rdf-validation/badge-class-invalid-issuer-type.json", false);
+			public final static Sample RDF_VALIDATION_INVALID_CLASS = new Sample("ob20/rdf-validation/invalid-class.json", true);
+			public final static Sample RDF_VALIDATION_INVALID_EMPTY_CLASS = new Sample("ob20/rdf-validation/invalid-empty-type.json", true);
+			public final static Sample RDF_VALIDATION_INVALID_ELEM_CLASS = new Sample("ob20/rdf-validation/invalid-one-invalid-class.json", true);
+			public final static Sample RDF_VALIDATION_INVALID_ISSUER_TYPE = new Sample("ob20/rdf-validation/badge-class-invalid-issuer-type.json", true);
 			public final static Sample RDF_VALIDATION_VALID_EMPTY_CRITERIA_TYPE = new Sample("ob20/rdf-validation/valid-badge-class-empty-criteria-type.json", true);
 			// otiginal: test_validation: test_hosted_verification_object_in_assertion
 			public final static Sample ISSUER_WITH_ALLOWED_ORIGINS = new Sample("ob20/basic-assertion-with-allowed-origins.json", true);
 			public final static Sample ISSUER_WITH_ALLOWED_ORIGINS_VALID_STARTSWITH = new Sample("ob20/basic-assertion-with-allowed-origins-valid-starts-with.json", true);
-			public final static Sample ISSUER_WITH_ALLOWED_ORIGINS_INVALID_STARTSWITH = new Sample("ob20/basic-assertion-with-allowed-origins-invalid-starts-with.json", false);
+			public final static Sample ISSUER_WITH_ALLOWED_ORIGINS_INVALID_STARTSWITH = new Sample("ob20/basic-assertion-with-allowed-origins-invalid-starts-with.json", true);
 			public final static Sample ISSUER_WITH_ALLOWED_ORIGINS_VALID_MULTIPLE_STARTSWITH = new Sample("ob20/basic-assertion-with-allowed-origins-valid-multiple-starts-with.json", true);
+			public final static Sample ISSUER_WITH_ALLOWED_ORIGINS_INVALID_MULTIPLE_STARTSWITH = new Sample("ob20/basic-assertion-with-allowed-origins-invalid-multiple-starts-with.json", true);
 			// original: test_validation: test_assertion_not_expired
 			public final static Sample SIMPLE_EXPIRED_ASSERTION_JSON = new Sample("ob20/basic-assertion-expired.json", true);
 			// original: test_validation: test_assertion_not_expires_before_issue