diff --git a/test/resources/AcademicEvent.1.json b/test/resources/indexable/AcademicEvent.1.json
similarity index 100%
rename from test/resources/AcademicEvent.1.json
rename to test/resources/indexable/AcademicEvent.1.json
diff --git a/test/resources/AcademicEvent.2.json b/test/resources/indexable/AcademicEvent.2.json
similarity index 100%
rename from test/resources/AcademicEvent.2.json
rename to test/resources/indexable/AcademicEvent.2.json
diff --git a/test/resources/AcademicEvent.3.json b/test/resources/indexable/AcademicEvent.3.json
similarity index 100%
rename from test/resources/AcademicEvent.3.json
rename to test/resources/indexable/AcademicEvent.3.json
diff --git a/test/resources/Article.1.json b/test/resources/indexable/Article.1.json
similarity index 100%
rename from test/resources/Article.1.json
rename to test/resources/indexable/Article.1.json
diff --git a/test/resources/Article.2.json b/test/resources/indexable/Article.2.json
similarity index 100%
rename from test/resources/Article.2.json
rename to test/resources/indexable/Article.2.json
diff --git a/test/resources/Article.3.json b/test/resources/indexable/Article.3.json
similarity index 100%
rename from test/resources/Article.3.json
rename to test/resources/indexable/Article.3.json
diff --git a/test/resources/Article.4.json b/test/resources/indexable/Article.4.json
similarity index 100%
rename from test/resources/Article.4.json
rename to test/resources/indexable/Article.4.json
diff --git a/test/resources/Book.1.json b/test/resources/indexable/Book.1.json
similarity index 100%
rename from test/resources/Book.1.json
rename to test/resources/indexable/Book.1.json
diff --git a/test/resources/Book.2.json b/test/resources/indexable/Book.2.json
similarity index 100%
rename from test/resources/Book.2.json
rename to test/resources/indexable/Book.2.json
diff --git a/test/resources/Book.3.json b/test/resources/indexable/Book.3.json
similarity index 100%
rename from test/resources/Book.3.json
rename to test/resources/indexable/Book.3.json
diff --git a/test/resources/Book.4.json b/test/resources/indexable/Book.4.json
similarity index 100%
rename from test/resources/Book.4.json
rename to test/resources/indexable/Book.4.json
diff --git a/test/resources/Building.1.json b/test/resources/indexable/Building.1.json
similarity index 100%
rename from test/resources/Building.1.json
rename to test/resources/indexable/Building.1.json
diff --git a/test/resources/Catalog.1.json b/test/resources/indexable/Catalog.1.json
similarity index 100%
rename from test/resources/Catalog.1.json
rename to test/resources/indexable/Catalog.1.json
diff --git a/test/resources/Catalog.2.json b/test/resources/indexable/Catalog.2.json
similarity index 100%
rename from test/resources/Catalog.2.json
rename to test/resources/indexable/Catalog.2.json
diff --git a/test/resources/ContactPoint.1.json b/test/resources/indexable/ContactPoint.1.json
similarity index 100%
rename from test/resources/ContactPoint.1.json
rename to test/resources/indexable/ContactPoint.1.json
diff --git a/test/resources/CourseOfStudies.1.json b/test/resources/indexable/CourseOfStudies.1.json
similarity index 100%
rename from test/resources/CourseOfStudies.1.json
rename to test/resources/indexable/CourseOfStudies.1.json
diff --git a/test/resources/DateSeries.1.json b/test/resources/indexable/DateSeries.1.json
similarity index 100%
rename from test/resources/DateSeries.1.json
rename to test/resources/indexable/DateSeries.1.json
diff --git a/test/resources/DateSeries.2.json b/test/resources/indexable/DateSeries.2.json
similarity index 100%
rename from test/resources/DateSeries.2.json
rename to test/resources/indexable/DateSeries.2.json
diff --git a/test/resources/DateSeries.3.json b/test/resources/indexable/DateSeries.3.json
similarity index 100%
rename from test/resources/DateSeries.3.json
rename to test/resources/indexable/DateSeries.3.json
diff --git a/test/resources/Dish.1.json b/test/resources/indexable/Dish.1.json
similarity index 100%
rename from test/resources/Dish.1.json
rename to test/resources/indexable/Dish.1.json
diff --git a/test/resources/Dish.2.json b/test/resources/indexable/Dish.2.json
similarity index 100%
rename from test/resources/Dish.2.json
rename to test/resources/indexable/Dish.2.json
diff --git a/test/resources/Dish.3.json b/test/resources/indexable/Dish.3.json
similarity index 100%
rename from test/resources/Dish.3.json
rename to test/resources/indexable/Dish.3.json
diff --git a/test/resources/Favorite.json b/test/resources/indexable/Favorite.json
similarity index 100%
rename from test/resources/Favorite.json
rename to test/resources/indexable/Favorite.json
diff --git a/test/resources/Floor.1.json b/test/resources/indexable/Floor.1.json
similarity index 100%
rename from test/resources/Floor.1.json
rename to test/resources/indexable/Floor.1.json
diff --git a/test/resources/Floor.2.json b/test/resources/indexable/Floor.2.json
similarity index 100%
rename from test/resources/Floor.2.json
rename to test/resources/indexable/Floor.2.json
diff --git a/test/resources/Floor.3.json b/test/resources/indexable/Floor.3.json
similarity index 100%
rename from test/resources/Floor.3.json
rename to test/resources/indexable/Floor.3.json
diff --git a/test/resources/Message.1.json b/test/resources/indexable/Message.1.json
similarity index 100%
rename from test/resources/Message.1.json
rename to test/resources/indexable/Message.1.json
diff --git a/test/resources/Message.2.json b/test/resources/indexable/Message.2.json
similarity index 100%
rename from test/resources/Message.2.json
rename to test/resources/indexable/Message.2.json
diff --git a/test/resources/Message.3.json b/test/resources/indexable/Message.3.json
similarity index 100%
rename from test/resources/Message.3.json
rename to test/resources/indexable/Message.3.json
diff --git a/test/resources/Organization.1.json b/test/resources/indexable/Organization.1.json
similarity index 100%
rename from test/resources/Organization.1.json
rename to test/resources/indexable/Organization.1.json
diff --git a/test/resources/Organization.2.json b/test/resources/indexable/Organization.2.json
similarity index 100%
rename from test/resources/Organization.2.json
rename to test/resources/indexable/Organization.2.json
diff --git a/test/resources/Periodical.1.json b/test/resources/indexable/Periodical.1.json
similarity index 100%
rename from test/resources/Periodical.1.json
rename to test/resources/indexable/Periodical.1.json
diff --git a/test/resources/Periodical.2.json b/test/resources/indexable/Periodical.2.json
similarity index 100%
rename from test/resources/Periodical.2.json
rename to test/resources/indexable/Periodical.2.json
diff --git a/test/resources/Person.1.json b/test/resources/indexable/Person.1.json
similarity index 100%
rename from test/resources/Person.1.json
rename to test/resources/indexable/Person.1.json
diff --git a/test/resources/Person.2.json b/test/resources/indexable/Person.2.json
similarity index 100%
rename from test/resources/Person.2.json
rename to test/resources/indexable/Person.2.json
diff --git a/test/resources/Person.3.json b/test/resources/indexable/Person.3.json
similarity index 100%
rename from test/resources/Person.3.json
rename to test/resources/indexable/Person.3.json
diff --git a/test/resources/PointOfInterest.1.json b/test/resources/indexable/PointOfInterest.1.json
similarity index 100%
rename from test/resources/PointOfInterest.1.json
rename to test/resources/indexable/PointOfInterest.1.json
diff --git a/test/resources/PointOfInterest.2.json b/test/resources/indexable/PointOfInterest.2.json
similarity index 100%
rename from test/resources/PointOfInterest.2.json
rename to test/resources/indexable/PointOfInterest.2.json
diff --git a/test/resources/Room.1.json b/test/resources/indexable/Room.1.json
similarity index 100%
rename from test/resources/Room.1.json
rename to test/resources/indexable/Room.1.json
diff --git a/test/resources/Room.2.json b/test/resources/indexable/Room.2.json
similarity index 100%
rename from test/resources/Room.2.json
rename to test/resources/indexable/Room.2.json
diff --git a/test/resources/Room.3.json b/test/resources/indexable/Room.3.json
similarity index 100%
rename from test/resources/Room.3.json
rename to test/resources/indexable/Room.3.json
diff --git a/test/resources/Room.4.json b/test/resources/indexable/Room.4.json
similarity index 100%
rename from test/resources/Room.4.json
rename to test/resources/indexable/Room.4.json
diff --git a/test/resources/Semester.1.json b/test/resources/indexable/Semester.1.json
similarity index 100%
rename from test/resources/Semester.1.json
rename to test/resources/indexable/Semester.1.json
diff --git a/test/resources/Semester.2.json b/test/resources/indexable/Semester.2.json
similarity index 100%
rename from test/resources/Semester.2.json
rename to test/resources/indexable/Semester.2.json
diff --git a/test/resources/Ticket.json b/test/resources/indexable/Ticket.json
similarity index 100%
rename from test/resources/Ticket.json
rename to test/resources/indexable/Ticket.json
diff --git a/test/resources/Tour.1.json b/test/resources/indexable/Tour.1.json
similarity index 100%
rename from test/resources/Tour.1.json
rename to test/resources/indexable/Tour.1.json
diff --git a/test/resources/Tour.2.json b/test/resources/indexable/Tour.2.json
similarity index 100%
rename from test/resources/Tour.2.json
rename to test/resources/indexable/Tour.2.json
diff --git a/test/resources/Video.1.json b/test/resources/indexable/Video.1.json
similarity index 100%
rename from test/resources/Video.1.json
rename to test/resources/indexable/Video.1.json
diff --git a/test/resources/Video.2.json b/test/resources/indexable/Video.2.json
similarity index 100%
rename from test/resources/Video.2.json
rename to test/resources/indexable/Video.2.json
diff --git a/test/schema.spec.ts b/test/schema.spec.ts
index 4643138e..26d098fa 100644
--- a/test/schema.spec.ts
+++ b/test/schema.spec.ts
@@ -230,7 +230,7 @@ export class SchemaSpec {
           fail(`'${thingName}'#'${property.name}' union type '${nestedType.type}' is not handled by this test!`);
         }
       }
-    }
+    };
 
     for (const thingName of SchemaSpec.thingNames) {
       const thingReflection = SchemaSpec.objects[`${thingName}`];
@@ -318,7 +318,10 @@ export class SchemaSpec {
 
   @test
   async 'validate against test files'() {
-    const errorsPerFile = await validateFiles(resolve('lib', 'schema'), resolve('test', 'resources'));
+    const errorsPerFile = {
+      ...await validateFiles(resolve('lib', 'schema'), resolve('test', 'resources')),
+      ...await validateFiles(resolve('lib', 'schema'), resolve('test', 'resources', 'indexable')),
+    };
 
     let unexpected = false;
     Object.keys(errorsPerFile).forEach((file) => {