diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/alterKeyspace.cql b/driver-cql-shaded/src/test/resources/cql3_examples/alterKeyspace.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/alterKeyspace.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/alterKeyspace.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/alterMaterializedView.cql b/driver-cql-shaded/src/test/resources/cql3_examples/alterMaterializedView.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/alterMaterializedView.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/alterMaterializedView.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/alterRole.cql b/driver-cql-shaded/src/test/resources/cql3_examples/alterRole.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/alterRole.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/alterRole.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/alterTable.cql b/driver-cql-shaded/src/test/resources/cql3_examples/alterTable.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/alterTable.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/alterTable.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/alterType.cql b/driver-cql-shaded/src/test/resources/cql3_examples/alterType.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/alterType.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/alterType.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/alterUser.cql b/driver-cql-shaded/src/test/resources/cql3_examples/alterUser.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/alterUser.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/alterUser.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/applyBatch.cql b/driver-cql-shaded/src/test/resources/cql3_examples/applyBatch.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/applyBatch.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/applyBatch.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/createAggregate.cql b/driver-cql-shaded/src/test/resources/cql3_examples/createAggregate.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/createAggregate.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/createAggregate.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/createFunction.cql b/driver-cql-shaded/src/test/resources/cql3_examples/createFunction.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/createFunction.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/createFunction.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/createIndex.cql b/driver-cql-shaded/src/test/resources/cql3_examples/createIndex.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/createIndex.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/createIndex.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/createKeyspace.cql b/driver-cql-shaded/src/test/resources/cql3_examples/createKeyspace.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/createKeyspace.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/createKeyspace.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/createMaterializedView.cql b/driver-cql-shaded/src/test/resources/cql3_examples/createMaterializedView.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/createMaterializedView.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/createMaterializedView.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/createRole.cql b/driver-cql-shaded/src/test/resources/cql3_examples/createRole.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/createRole.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/createRole.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/createTable.cql b/driver-cql-shaded/src/test/resources/cql3_examples/createTable.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/createTable.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/createTable.cql
diff --git a/driver-cql-shaded/src/test/resources/cql3_examples/createTableComplexKey.cql b/driver-cql-shaded/src/test/resources/cql3_examples/createTableComplexKey.cql
new file mode 100644
index 000000000..823ce9791
--- /dev/null
+++ b/driver-cql-shaded/src/test/resources/cql3_examples/createTableComplexKey.cql
@@ -0,0 +1,8 @@
+CREATE TABLE cycling.race_winners (
+   race_name text,
+   race_position int,
+   cyclist_name FROZEN<fullname>,
+   rider_code text,
+   details text,
+   PRIMARY KEY ((race_name, race_position), cyclist_name, rider_code)
+);
diff --git a/driver-cql-shaded/src/test/resources/cql3_examples/createTableNestedTypes.cql b/driver-cql-shaded/src/test/resources/cql3_examples/createTableNestedTypes.cql
new file mode 100644
index 000000000..b51945e23
--- /dev/null
+++ b/driver-cql-shaded/src/test/resources/cql3_examples/createTableNestedTypes.cql
@@ -0,0 +1,5 @@
+CREATE TABLE cycling.race_winners (
+   race_name text,
+   race_position int,
+   cyclist_name List<Set<fullname>>,
+   PRIMARY KEY (race_name, race_position));
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/createTrigger.cql b/driver-cql-shaded/src/test/resources/cql3_examples/createTrigger.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/createTrigger.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/createTrigger.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/createType.cql b/driver-cql-shaded/src/test/resources/cql3_examples/createType.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/createType.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/createType.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/createUser.cql b/driver-cql-shaded/src/test/resources/cql3_examples/createUser.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/createUser.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/createUser.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/delete.cql b/driver-cql-shaded/src/test/resources/cql3_examples/delete.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/delete.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/delete.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/dropAggregate.cql b/driver-cql-shaded/src/test/resources/cql3_examples/dropAggregate.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/dropAggregate.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/dropAggregate.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/dropFunction.cql b/driver-cql-shaded/src/test/resources/cql3_examples/dropFunction.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/dropFunction.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/dropFunction.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/dropIndex.cql b/driver-cql-shaded/src/test/resources/cql3_examples/dropIndex.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/dropIndex.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/dropIndex.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/dropKeyspace.cql b/driver-cql-shaded/src/test/resources/cql3_examples/dropKeyspace.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/dropKeyspace.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/dropKeyspace.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/dropMaterializedView.cql b/driver-cql-shaded/src/test/resources/cql3_examples/dropMaterializedView.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/dropMaterializedView.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/dropMaterializedView.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/dropRole.cql b/driver-cql-shaded/src/test/resources/cql3_examples/dropRole.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/dropRole.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/dropRole.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/dropTable.cql b/driver-cql-shaded/src/test/resources/cql3_examples/dropTable.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/dropTable.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/dropTable.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/dropTrigger.cql b/driver-cql-shaded/src/test/resources/cql3_examples/dropTrigger.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/dropTrigger.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/dropTrigger.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/dropType.cql b/driver-cql-shaded/src/test/resources/cql3_examples/dropType.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/dropType.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/dropType.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/dropUser.cql b/driver-cql-shaded/src/test/resources/cql3_examples/dropUser.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/dropUser.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/dropUser.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/grant.cql b/driver-cql-shaded/src/test/resources/cql3_examples/grant.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/grant.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/grant.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/insert.cql b/driver-cql-shaded/src/test/resources/cql3_examples/insert.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/insert.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/insert.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/listPermissions.cql b/driver-cql-shaded/src/test/resources/cql3_examples/listPermissions.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/listPermissions.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/listPermissions.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/listRoles.cql b/driver-cql-shaded/src/test/resources/cql3_examples/listRoles.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/listRoles.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/listRoles.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/revoke.cql b/driver-cql-shaded/src/test/resources/cql3_examples/revoke.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/revoke.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/revoke.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/select.cql b/driver-cql-shaded/src/test/resources/cql3_examples/select.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/select.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/select.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/truncate.cql b/driver-cql-shaded/src/test/resources/cql3_examples/truncate.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/truncate.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/truncate.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/update.cql b/driver-cql-shaded/src/test/resources/cql3_examples/update.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/update.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/update.cql
diff --git a/driver-cql-shaded/src/main/resources/cql3_examples/use.cql b/driver-cql-shaded/src/test/resources/cql3_examples/use.cql
similarity index 100%
rename from driver-cql-shaded/src/main/resources/cql3_examples/use.cql
rename to driver-cql-shaded/src/test/resources/cql3_examples/use.cql