diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 50ed802c9..d4c068bf8 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -60,13 +60,13 @@ test - - io.ebean - ebean-ddl-generator - - 12.11.4A - test - + + + + + + + diff --git a/ebean-core/src/test/resources/ebean.mf b/ebean-core/src/test/resources/ebean.mf deleted file mode 100644 index fc2fd6902..000000000 --- a/ebean-core/src/test/resources/ebean.mf +++ /dev/null @@ -1,7 +0,0 @@ -agent-use-only: true -profile-location: true -entity-packages: org,misc -transactional-packages: org -querybean-packages: none -synthetic: true - diff --git a/ebean-core/src/test/resources/logback-test.xml b/ebean-core/src/test/resources/logback-test.xml deleted file mode 100644 index 1b8a60a9b..000000000 --- a/ebean-core/src/test/resources/logback-test.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - TRACE - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - target/log/application.log - - TRACE - - - log/application.log.%d{yyyy-MM-dd} - 90 - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - target/log/readAuditQuery.log - - log/readAuditQuery.log.%d{yyyy-MM-dd} - 90 - - - %d{HH:mm:ss.SSS} %msg%n - - - - - target/log/readAudit.log - - log/readAudit.log.%d{yyyy-MM-dd} - 90 - - - %d{HH:mm:ss.SSS} %msg%n - - - - - target/log/change-log.log - - log/changeLog.log.%d{yyyy-MM-dd} - 90 - - - %d{HH:mm:ss.SSS} %msg%n - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 03bee753d..7fe6d6f9a 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -76,11 +76,75 @@ com.h2database h2 - 1.4.200 + 1.4.199 + + io.avaje + avaje-jsr305 + 1.0 + test + + + + io.ebean + ebean-migration + 12.4.0 + test + + + + io.avaje + mod-uuid + 1.1 + test + + + + javax.transaction + jta + 1.1 + test + + + + + javax.validation + validation-api + 1.1.0.Final + test + + + + jakarta.validation + jakarta.validation-api + 3.0.0 + test + + + + joda-time + joda-time + 2.9.7 + test + + + + javax.annotation + javax.annotation-api + 1.3.2 + test + + + commons-io + commons-io + 2.7 + test + + + org.postgresql postgresql @@ -143,7 +207,7 @@ true - io.ebean.tile:enhancement:12.6.0 + io.ebean.tile:enhancement:12.11.3 diff --git a/ebean-core/src/test/java/io/ebean/BaseTestCase.java b/ebean-test/src/test/java/io/ebean/BaseTestCase.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/BaseTestCase.java rename to ebean-test/src/test/java/io/ebean/BaseTestCase.java diff --git a/ebean-core/src/test/java/io/ebean/ColumnTest.java b/ebean-test/src/test/java/io/ebean/ColumnTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/ColumnTest.java rename to ebean-test/src/test/java/io/ebean/ColumnTest.java diff --git a/ebean-core/src/test/java/io/ebean/DbPrimaryTest.java b/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/DbPrimaryTest.java rename to ebean-test/src/test/java/io/ebean/DbPrimaryTest.java diff --git a/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java b/ebean-test/src/test/java/io/ebean/DtoQuery2Test.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/DtoQuery2Test.java rename to ebean-test/src/test/java/io/ebean/DtoQuery2Test.java diff --git a/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java rename to ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java diff --git a/ebean-core/src/test/java/io/ebean/DtoQueryTest.java b/ebean-test/src/test/java/io/ebean/DtoQueryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/DtoQueryTest.java rename to ebean-test/src/test/java/io/ebean/DtoQueryTest.java diff --git a/ebean-core/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java b/ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java rename to ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java diff --git a/ebean-core/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java b/ebean-test/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java rename to ebean-test/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java rename to ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java rename to ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/EbeanServer_deleteTest.java rename to ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java rename to ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java b/ebean-test/src/test/java/io/ebean/EbeanServer_refresh.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java rename to ebean-test/src/test/java/io/ebean/EbeanServer_refresh.java diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_saveAllTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/EbeanServer_saveAllTest.java rename to ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java diff --git a/ebean-core/src/test/java/io/ebean/ExtendedServerTest.java b/ebean-test/src/test/java/io/ebean/ExtendedServerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/ExtendedServerTest.java rename to ebean-test/src/test/java/io/ebean/ExtendedServerTest.java diff --git a/ebean-core/src/test/java/io/ebean/FetchConfigTest.java b/ebean-test/src/test/java/io/ebean/FetchConfigTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/FetchConfigTest.java rename to ebean-test/src/test/java/io/ebean/FetchConfigTest.java diff --git a/ebean-core/src/test/java/io/ebean/FetchGroupTest.java b/ebean-test/src/test/java/io/ebean/FetchGroupTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/FetchGroupTest.java rename to ebean-test/src/test/java/io/ebean/FetchGroupTest.java diff --git a/ebean-core/src/test/java/io/ebean/MyCurrentUserProvider.java b/ebean-test/src/test/java/io/ebean/MyCurrentUserProvider.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/MyCurrentUserProvider.java rename to ebean-test/src/test/java/io/ebean/MyCurrentUserProvider.java diff --git a/ebean-core/src/test/java/io/ebean/PlatformCondition.java b/ebean-test/src/test/java/io/ebean/PlatformCondition.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/PlatformCondition.java rename to ebean-test/src/test/java/io/ebean/PlatformCondition.java diff --git a/ebean-core/src/test/java/io/ebean/PropertyTest.java b/ebean-test/src/test/java/io/ebean/PropertyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/PropertyTest.java rename to ebean-test/src/test/java/io/ebean/PropertyTest.java diff --git a/ebean-core/src/test/java/io/ebean/SqlRowBooleanTest.java b/ebean-test/src/test/java/io/ebean/SqlRowBooleanTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/SqlRowBooleanTest.java rename to ebean-test/src/test/java/io/ebean/SqlRowBooleanTest.java diff --git a/ebean-core/src/test/java/io/ebean/StringHelperTest.java b/ebean-test/src/test/java/io/ebean/StringHelperTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/StringHelperTest.java rename to ebean-test/src/test/java/io/ebean/StringHelperTest.java diff --git a/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java b/ebean-test/src/test/java/io/ebean/TestDirtyProperties.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/TestDirtyProperties.java rename to ebean-test/src/test/java/io/ebean/TestDirtyProperties.java diff --git a/ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java b/ebean-test/src/test/java/io/ebean/TestFilterWithEnum.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java rename to ebean-test/src/test/java/io/ebean/TestFilterWithEnum.java diff --git a/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java b/ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java rename to ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java diff --git a/ebean-core/src/test/java/io/ebean/TextExpressionListTest.java b/ebean-test/src/test/java/io/ebean/TextExpressionListTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/TextExpressionListTest.java rename to ebean-test/src/test/java/io/ebean/TextExpressionListTest.java diff --git a/ebean-core/src/test/java/io/ebean/TransactionalTestCase.java b/ebean-test/src/test/java/io/ebean/TransactionalTestCase.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/TransactionalTestCase.java rename to ebean-test/src/test/java/io/ebean/TransactionalTestCase.java diff --git a/ebean-core/src/test/java/io/ebean/TxScopeTest.java b/ebean-test/src/test/java/io/ebean/TxScopeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/TxScopeTest.java rename to ebean-test/src/test/java/io/ebean/TxScopeTest.java diff --git a/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java b/ebean-test/src/test/java/io/ebean/UpdateQueryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/UpdateQueryTest.java rename to ebean-test/src/test/java/io/ebean/UpdateQueryTest.java diff --git a/ebean-core/src/test/java/io/ebean/annotation/ForPlatform.java b/ebean-test/src/test/java/io/ebean/annotation/ForPlatform.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/annotation/ForPlatform.java rename to ebean-test/src/test/java/io/ebean/annotation/ForPlatform.java diff --git a/ebean-core/src/test/java/io/ebean/annotation/IgnorePlatform.java b/ebean-test/src/test/java/io/ebean/annotation/IgnorePlatform.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/annotation/IgnorePlatform.java rename to ebean-test/src/test/java/io/ebean/annotation/IgnorePlatform.java diff --git a/ebean-core/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java b/ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java rename to ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java diff --git a/ebean-core/src/test/java/io/ebean/cache/CacheKeyTest.java b/ebean-test/src/test/java/io/ebean/cache/CacheKeyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/cache/CacheKeyTest.java rename to ebean-test/src/test/java/io/ebean/cache/CacheKeyTest.java diff --git a/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java b/ebean-test/src/test/java/io/ebean/cache/ServerCacheManagerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java rename to ebean-test/src/test/java/io/ebean/cache/ServerCacheManagerTest.java diff --git a/ebean-core/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java b/ebean-test/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java rename to ebean-test/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java diff --git a/ebean-core/src/test/java/io/ebean/common/BeanListTest.java b/ebean-test/src/test/java/io/ebean/common/BeanListTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/common/BeanListTest.java rename to ebean-test/src/test/java/io/ebean/common/BeanListTest.java diff --git a/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java b/ebean-test/src/test/java/io/ebean/common/BeanMapTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/common/BeanMapTest.java rename to ebean-test/src/test/java/io/ebean/common/BeanMapTest.java diff --git a/ebean-core/src/test/java/io/ebean/common/BeanSetTest.java b/ebean-test/src/test/java/io/ebean/common/BeanSetTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/common/BeanSetTest.java rename to ebean-test/src/test/java/io/ebean/common/BeanSetTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/ContainerConfigTest.java b/ebean-test/src/test/java/io/ebean/config/ContainerConfigTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/ContainerConfigTest.java rename to ebean-test/src/test/java/io/ebean/config/ContainerConfigTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java b/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java rename to ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/DbConstraintNamingTest.java b/ebean-test/src/test/java/io/ebean/config/DbConstraintNamingTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/DbConstraintNamingTest.java rename to ebean-test/src/test/java/io/ebean/config/DbConstraintNamingTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/DbMigrationConfigTest.java b/ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/DbMigrationConfigTest.java rename to ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/DocStoreConfigTest.java b/ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/DocStoreConfigTest.java rename to ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/MatchingNamingConventionTest.java b/ebean-test/src/test/java/io/ebean/config/MatchingNamingConventionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/MatchingNamingConventionTest.java rename to ebean-test/src/test/java/io/ebean/config/MatchingNamingConventionTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java b/ebean-test/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java rename to ebean-test/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/PropertiesWrapperTest.java b/ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/PropertiesWrapperTest.java rename to ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java b/ebean-test/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java rename to ebean-test/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/TestTableName.java b/ebean-test/src/test/java/io/ebean/config/TestTableName.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/TestTableName.java rename to ebean-test/src/test/java/io/ebean/config/TestTableName.java diff --git a/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java b/ebean-test/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java rename to ebean-test/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java b/ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java rename to ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java diff --git a/ebean-core/src/test/java/io/ebean/event/BeanFindControllerTest.java b/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/event/BeanFindControllerTest.java rename to ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java diff --git a/ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java b/ebean-test/src/test/java/io/ebean/event/BeanPersistControllerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java rename to ebean-test/src/test/java/io/ebean/event/BeanPersistControllerTest.java diff --git a/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java b/ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java rename to ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java diff --git a/ebean-core/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java b/ebean-test/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java rename to ebean-test/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java diff --git a/ebean-core/src/test/java/io/ebean/json/EJsonTests.java b/ebean-test/src/test/java/io/ebean/json/EJsonTests.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/json/EJsonTests.java rename to ebean-test/src/test/java/io/ebean/json/EJsonTests.java diff --git a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java rename to ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java diff --git a/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java b/ebean-test/src/test/java/io/ebean/plugin/ExpressionPathTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java rename to ebean-test/src/test/java/io/ebean/plugin/ExpressionPathTest.java diff --git a/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java b/ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java rename to ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java diff --git a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java b/ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java rename to ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java diff --git a/ebean-core/src/test/java/io/ebean/server/type/MyDayOfWeek.java b/ebean-test/src/test/java/io/ebean/server/type/MyDayOfWeek.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/server/type/MyDayOfWeek.java rename to ebean-test/src/test/java/io/ebean/server/type/MyDayOfWeek.java diff --git a/ebean-core/src/test/java/io/ebean/server/type/MyEnum.java b/ebean-test/src/test/java/io/ebean/server/type/MyEnum.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/server/type/MyEnum.java rename to ebean-test/src/test/java/io/ebean/server/type/MyEnum.java diff --git a/ebean-core/src/test/java/io/ebean/server/type/MySex.java b/ebean-test/src/test/java/io/ebean/server/type/MySex.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/server/type/MySex.java rename to ebean-test/src/test/java/io/ebean/server/type/MySex.java diff --git a/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java b/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java index 6950cdd59..b1f91e4dd 100644 --- a/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java +++ b/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java @@ -3,7 +3,7 @@ package io.ebean.test; import com.fasterxml.jackson.databind.JsonNode; import io.ebean.DB; import org.junit.jupiter.api.Test; -import org.test.BSimpleWithGen; +import org.etest.BSimpleFor; import java.util.List; @@ -16,9 +16,9 @@ public class DbJsonTest { @Test public void of() { - DB.find(BSimpleWithGen.class).delete(); + DB.find(BSimpleFor.class).delete(); - BSimpleWithGen bean = new BSimpleWithGen("something"); + BSimpleFor bean = new BSimpleFor("something"); DB.save(bean); assertThat(bean.getVersion()).isEqualTo(1); @@ -29,10 +29,10 @@ public class DbJsonTest { .assertContentMatches("/bean/example-bean.json"); - BSimpleWithGen bean2 = new BSimpleWithGen("other"); + BSimpleFor bean2 = new BSimpleFor("other"); DB.save(bean2); - final List beans = DB.find(BSimpleWithGen.class).findList(); + final List beans = DB.find(BSimpleFor.class).findList(); DbJson.of(beans) //.withPlaceholder("_") @@ -43,10 +43,10 @@ public class DbJsonTest { @Test public void assertContains_pass() { - BSimpleWithGen bean = new BSimpleWithGen("something-contains-me", "YeahNah"); + BSimpleFor bean = new BSimpleFor("something-contains-me", "YeahNah"); DB.save(bean); - BSimpleWithGen found = DB.find(BSimpleWithGen.class, bean.getId()); + BSimpleFor found = DB.find(BSimpleFor.class, bean.getId()); DbJson.of(found).assertContainsResource("/bean/contains-minimal.json"); DbJson.of(found).assertContains(readResource("/bean/contains-with-version.json")); @@ -57,7 +57,7 @@ public class DbJsonTest { @Test public void asJson() { - BSimpleWithGen bean = new BSimpleWithGen("other"); + BSimpleFor bean = new BSimpleFor("other"); DB.save(bean); String asJson = DbJson.of(bean) diff --git a/ebean-test/src/test/java/io/ebean/test/JsonTest.java b/ebean-test/src/test/java/io/ebean/test/JsonTest.java index ec98c86be..3cb6857ad 100644 --- a/ebean-test/src/test/java/io/ebean/test/JsonTest.java +++ b/ebean-test/src/test/java/io/ebean/test/JsonTest.java @@ -2,7 +2,7 @@ package io.ebean.test; import com.fasterxml.jackson.databind.JsonNode; import org.junit.jupiter.api.Test; -import org.test.PlainBean; +import org.etest.PlainBean; import java.util.List; diff --git a/ebean-core/src/test/java/io/ebean/text/PathPropertiesTests.java b/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/text/PathPropertiesTests.java rename to ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java diff --git a/ebean-core/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java b/ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java rename to ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java diff --git a/ebean-core/src/test/java/io/ebean/text/json/JsonContextTest.java b/ebean-test/src/test/java/io/ebean/text/json/JsonContextTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/text/json/JsonContextTest.java rename to ebean-test/src/test/java/io/ebean/text/json/JsonContextTest.java diff --git a/ebean-core/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java b/ebean-test/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java rename to ebean-test/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java diff --git a/ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java b/ebean-test/src/test/java/io/ebean/util/CamelCaseHelperTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java rename to ebean-test/src/test/java/io/ebean/util/CamelCaseHelperTest.java diff --git a/ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java b/ebean-test/src/test/java/io/ebean/util/TestEncodeB64.java similarity index 100% rename from ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java rename to ebean-test/src/test/java/io/ebean/util/TestEncodeB64.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/BindParamsTest.java b/ebean-test/src/test/java/io/ebeaninternal/api/BindParamsTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/api/BindParamsTest.java rename to ebean-test/src/test/java/io/ebeaninternal/api/BindParamsTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java b/ebean-test/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java rename to ebean-test/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java b/ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java rename to ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java rename to ebean-test/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/api/TDSpiServer.java rename to ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java b/ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java rename to ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java b/ebean-test/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java rename to ebean-test/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/Helper.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/Helper.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/changelog/Helper.java rename to ebean-test/src/test/java/io/ebeaninternal/server/changelog/Helper.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/HelpCreateQueryRequest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/HelpCreateQueryRequest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/HelpCreateQueryRequest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/HelpCreateQueryRequest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java b/ebean-test/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java rename to ebean-test/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/SameTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/SameTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/SameTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/SameTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java b/ebean-test/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java rename to ebean-test/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java rename to ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java rename to ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java rename to ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java rename to ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java rename to ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java rename to ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java rename to ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java rename to ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/JsonTester.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/JsonTester.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java rename to ebean-test/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java b/ebean-test/src/test/java/io/ebeaninternal/server/util/Md5Test.java similarity index 100% rename from ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java rename to ebean-test/src/test/java/io/ebeaninternal/server/util/Md5Test.java diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java rename to ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java rename to ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java similarity index 100% rename from ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java rename to ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java diff --git a/ebean-core/src/test/java/io/ebeantest/CaptureLogger.java b/ebean-test/src/test/java/io/ebeantest/CaptureLogger.java similarity index 100% rename from ebean-core/src/test/java/io/ebeantest/CaptureLogger.java rename to ebean-test/src/test/java/io/ebeantest/CaptureLogger.java diff --git a/ebean-core/src/test/java/io/ebeantest/CapturingLoggerFactory.java b/ebean-test/src/test/java/io/ebeantest/CapturingLoggerFactory.java similarity index 100% rename from ebean-core/src/test/java/io/ebeantest/CapturingLoggerFactory.java rename to ebean-test/src/test/java/io/ebeantest/CapturingLoggerFactory.java diff --git a/ebean-core/src/test/java/io/ebeantest/LoggedSql.java b/ebean-test/src/test/java/io/ebeantest/LoggedSql.java similarity index 100% rename from ebean-core/src/test/java/io/ebeantest/LoggedSql.java rename to ebean-test/src/test/java/io/ebeantest/LoggedSql.java diff --git a/ebean-core/src/test/java/main/StartCockroach.java b/ebean-test/src/test/java/main/StartCockroach.java similarity index 100% rename from ebean-core/src/test/java/main/StartCockroach.java rename to ebean-test/src/test/java/main/StartCockroach.java diff --git a/ebean-core/src/test/java/main/StartMariaDb.java b/ebean-test/src/test/java/main/StartMariaDb.java similarity index 100% rename from ebean-core/src/test/java/main/StartMariaDb.java rename to ebean-test/src/test/java/main/StartMariaDb.java diff --git a/ebean-core/src/test/java/main/StartMySql.java b/ebean-test/src/test/java/main/StartMySql.java similarity index 100% rename from ebean-core/src/test/java/main/StartMySql.java rename to ebean-test/src/test/java/main/StartMySql.java diff --git a/ebean-core/src/test/java/main/StartNuoDB.java b/ebean-test/src/test/java/main/StartNuoDB.java similarity index 100% rename from ebean-core/src/test/java/main/StartNuoDB.java rename to ebean-test/src/test/java/main/StartNuoDB.java diff --git a/ebean-core/src/test/java/main/StartOracle.java b/ebean-test/src/test/java/main/StartOracle.java similarity index 100% rename from ebean-core/src/test/java/main/StartOracle.java rename to ebean-test/src/test/java/main/StartOracle.java diff --git a/ebean-core/src/test/java/main/StartPostgres.java b/ebean-test/src/test/java/main/StartPostgres.java similarity index 100% rename from ebean-core/src/test/java/main/StartPostgres.java rename to ebean-test/src/test/java/main/StartPostgres.java diff --git a/ebean-core/src/test/java/main/StartSqlServer.java b/ebean-test/src/test/java/main/StartSqlServer.java similarity index 100% rename from ebean-core/src/test/java/main/StartSqlServer.java rename to ebean-test/src/test/java/main/StartSqlServer.java diff --git a/ebean-core/src/test/java/misc/migration/history/v1_0/EHistory7.java b/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/history/v1_0/EHistory7.java rename to ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java diff --git a/ebean-core/src/test/java/misc/migration/history/v1_1/EHistory7.java b/ebean-test/src/test/java/misc/migration/history/v1_1/EHistory7.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/history/v1_1/EHistory7.java rename to ebean-test/src/test/java/misc/migration/history/v1_1/EHistory7.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/CKeyAssoc.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyAssoc.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/CKeyAssoc.java rename to ebean-test/src/test/java/misc/migration/v1_0/CKeyAssoc.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/CKeyDetail.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/CKeyDetail.java rename to ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyParent.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/CKeyParent.java rename to ebean-test/src/test/java/misc/migration/v1_0/CKeyParent.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/CKeyParentId.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyParentId.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/CKeyParentId.java rename to ebean-test/src/test/java/misc/migration/v1_0/CKeyParentId.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/DfkCascade.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascade.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/DfkCascade.java rename to ebean-test/src/test/java/misc/migration/v1_0/DfkCascade.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/DfkCascadeOne.java rename to ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/DfkNone.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkNone.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/DfkNone.java rename to ebean-test/src/test/java/misc/migration/v1_0/DfkNone.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java rename to ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/DfkOne.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkOne.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/DfkOne.java rename to ebean-test/src/test/java/misc/migration/v1_0/DfkOne.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/DfkSetNull.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkSetNull.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/DfkSetNull.java rename to ebean-test/src/test/java/misc/migration/v1_0/DfkSetNull.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/EBasic.java rename to ebean-test/src/test/java/misc/migration/v1_0/EBasic.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/EEnum.java rename to ebean-test/src/test/java/misc/migration/v1_0/EEnum.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/EHistory.java rename to ebean-test/src/test/java/misc/migration/v1_0/EHistory.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/EHistory2.java rename to ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/EHistory3.java rename to ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/EHistory4.java rename to ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/EHistory5.java rename to ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/EHistory6.java rename to ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/ERef.java b/ebean-test/src/test/java/misc/migration/v1_0/ERef.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/ERef.java rename to ebean-test/src/test/java/misc/migration/v1_0/ERef.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_0/ESoftdelete.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/ESoftdelete.java rename to ebean-test/src/test/java/misc/migration/v1_0/ESoftdelete.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_0/MtmChild.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/MtmChild.java rename to ebean-test/src/test/java/misc/migration/v1_0/MtmChild.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_0/MtmMaster.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/MtmMaster.java rename to ebean-test/src/test/java/misc/migration/v1_0/MtmMaster.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/OtoChild.java b/ebean-test/src/test/java/misc/migration/v1_0/OtoChild.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/OtoChild.java rename to ebean-test/src/test/java/misc/migration/v1_0/OtoChild.java diff --git a/ebean-core/src/test/java/misc/migration/v1_0/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_0/OtoMaster.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_0/OtoMaster.java rename to ebean-test/src/test/java/misc/migration/v1_0/OtoMaster.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/CKeyAssoc.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyAssoc.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/CKeyAssoc.java rename to ebean-test/src/test/java/misc/migration/v1_1/CKeyAssoc.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/CKeyDetail.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyDetail.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/CKeyDetail.java rename to ebean-test/src/test/java/misc/migration/v1_1/CKeyDetail.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/CKeyParent.java rename to ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/CKeyParentId.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParentId.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/CKeyParentId.java rename to ebean-test/src/test/java/misc/migration/v1_1/CKeyParentId.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/DfkCascade.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascade.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/DfkCascade.java rename to ebean-test/src/test/java/misc/migration/v1_1/DfkCascade.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/DfkCascadeOne.java rename to ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/DfkNone.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkNone.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/DfkNone.java rename to ebean-test/src/test/java/misc/migration/v1_1/DfkNone.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java rename to ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/DfkOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkOne.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/DfkOne.java rename to ebean-test/src/test/java/misc/migration/v1_1/DfkOne.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/DfkSetNull.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkSetNull.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/DfkSetNull.java rename to ebean-test/src/test/java/misc/migration/v1_1/DfkSetNull.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EBasic.java rename to ebean-test/src/test/java/misc/migration/v1_1/EBasic.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_1/EEnum.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EEnum.java rename to ebean-test/src/test/java/misc/migration/v1_1/EEnum.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EHistory.java rename to ebean-test/src/test/java/misc/migration/v1_1/EHistory.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EHistory2.java rename to ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EHistory3.java rename to ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EHistory4.java rename to ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EHistory5.java rename to ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EHistory6.java rename to ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/ESoftdelete.java rename to ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/EUser.java b/ebean-test/src/test/java/misc/migration/v1_1/EUser.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/EUser.java rename to ebean-test/src/test/java/misc/migration/v1_1/EUser.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/MtmChild.java rename to ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/MtmMaster.java rename to ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/OtoChild.java b/ebean-test/src/test/java/misc/migration/v1_1/OtoChild.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/OtoChild.java rename to ebean-test/src/test/java/misc/migration/v1_1/OtoChild.java diff --git a/ebean-core/src/test/java/misc/migration/v1_1/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_1/OtoMaster.java rename to ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/CKeyAssoc.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyAssoc.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/CKeyAssoc.java rename to ebean-test/src/test/java/misc/migration/v1_2/CKeyAssoc.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/CKeyDetail.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyDetail.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/CKeyDetail.java rename to ebean-test/src/test/java/misc/migration/v1_2/CKeyDetail.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyParent.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/CKeyParent.java rename to ebean-test/src/test/java/misc/migration/v1_2/CKeyParent.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/CKeyParentId.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyParentId.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/CKeyParentId.java rename to ebean-test/src/test/java/misc/migration/v1_2/CKeyParentId.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/DfkCascade.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascade.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/DfkCascade.java rename to ebean-test/src/test/java/misc/migration/v1_2/DfkCascade.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/DfkCascadeOne.java rename to ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/DfkNone.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkNone.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/DfkNone.java rename to ebean-test/src/test/java/misc/migration/v1_2/DfkNone.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java rename to ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/DfkOne.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkOne.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/DfkOne.java rename to ebean-test/src/test/java/misc/migration/v1_2/DfkOne.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/DfkSetNull.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkSetNull.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/DfkSetNull.java rename to ebean-test/src/test/java/misc/migration/v1_2/DfkSetNull.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/EBasic.java rename to ebean-test/src/test/java/misc/migration/v1_2/EBasic.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/EEnum.java rename to ebean-test/src/test/java/misc/migration/v1_2/EEnum.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/EHistory.java rename to ebean-test/src/test/java/misc/migration/v1_2/EHistory.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/EHistory2.java rename to ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/EHistory3.java rename to ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/EHistory4.java rename to ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/EHistory5.java rename to ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/EHistory6.java rename to ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/ERef.java b/ebean-test/src/test/java/misc/migration/v1_2/ERef.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/ERef.java rename to ebean-test/src/test/java/misc/migration/v1_2/ERef.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_2/ESoftdelete.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/ESoftdelete.java rename to ebean-test/src/test/java/misc/migration/v1_2/ESoftdelete.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_2/MtmChild.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/MtmChild.java rename to ebean-test/src/test/java/misc/migration/v1_2/MtmChild.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_2/MtmMaster.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/MtmMaster.java rename to ebean-test/src/test/java/misc/migration/v1_2/MtmMaster.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/OtoChild.java b/ebean-test/src/test/java/misc/migration/v1_2/OtoChild.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/OtoChild.java rename to ebean-test/src/test/java/misc/migration/v1_2/OtoChild.java diff --git a/ebean-core/src/test/java/misc/migration/v1_2/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_2/OtoMaster.java similarity index 100% rename from ebean-core/src/test/java/misc/migration/v1_2/OtoMaster.java rename to ebean-test/src/test/java/misc/migration/v1_2/OtoMaster.java diff --git a/ebean-core/src/test/java/org/ebeantest/LoggedSqlCollector.java b/ebean-test/src/test/java/org/ebeantest/LoggedSqlCollector.java similarity index 100% rename from ebean-core/src/test/java/org/ebeantest/LoggedSqlCollector.java rename to ebean-test/src/test/java/org/ebeantest/LoggedSqlCollector.java diff --git a/ebean-test/src/test/java/org/test/BSimpleWithGen.java b/ebean-test/src/test/java/org/etest/BSimpleFor.java similarity index 88% rename from ebean-test/src/test/java/org/test/BSimpleWithGen.java rename to ebean-test/src/test/java/org/etest/BSimpleFor.java index 5ee189229..2da204412 100644 --- a/ebean-test/src/test/java/org/test/BSimpleWithGen.java +++ b/ebean-test/src/test/java/org/etest/BSimpleFor.java @@ -1,4 +1,4 @@ -package org.test; +package org.etest; import io.ebean.annotation.WhenModified; @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; @Entity -public class BSimpleWithGen { +public class BSimpleFor { @Id private Integer id; @@ -29,11 +29,11 @@ public class BSimpleWithGen { @Version private long version; - public BSimpleWithGen(String name) { + public BSimpleFor(String name) { this.name = name; } - public BSimpleWithGen(String name, String other) { + public BSimpleFor(String name, String other) { this.name = name; this.other = other; } diff --git a/ebean-test/src/test/java/org/test/ForTestsBeforeAfterTest.java b/ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java similarity index 86% rename from ebean-test/src/test/java/org/test/ForTestsBeforeAfterTest.java rename to ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java index c59e77211..70ad19ead 100644 --- a/ebean-test/src/test/java/org/test/ForTestsBeforeAfterTest.java +++ b/ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java @@ -1,4 +1,4 @@ -package org.test; +package org.etest; import io.ebean.DB; import io.ebean.annotation.Transactional; @@ -34,7 +34,7 @@ public class ForTestsBeforeAfterTest { } private int getCount() { - return DB.find(BSimpleWithGen.class) + return DB.find(BSimpleFor.class) .where().eq("name", "ForTestsBeforeAfterTest") .findCount(); } @@ -42,7 +42,7 @@ public class ForTestsBeforeAfterTest { @Transactional private void doInsert() { - BSimpleWithGen bean = new BSimpleWithGen("ForTestsBeforeAfterTest"); + BSimpleFor bean = new BSimpleFor("ForTestsBeforeAfterTest"); DB.save(bean); } diff --git a/ebean-test/src/test/java/org/test/ForTestsTest.java b/ebean-test/src/test/java/org/etest/ForTestsTest.java similarity index 83% rename from ebean-test/src/test/java/org/test/ForTestsTest.java rename to ebean-test/src/test/java/org/etest/ForTestsTest.java index 6d2ec5a9a..b2b0804cb 100644 --- a/ebean-test/src/test/java/org/test/ForTestsTest.java +++ b/ebean-test/src/test/java/org/etest/ForTestsTest.java @@ -1,4 +1,4 @@ -package org.test; +package org.etest; import io.ebean.DB; import io.ebean.Transaction; @@ -36,18 +36,18 @@ public class ForTestsTest { @Test public void rollbackTransactions() { - DB.find(BSimpleWithGen.class).delete(); + DB.find(BSimpleFor.class).delete(); ForTests.rollbackAll(this::doInsert); - final int count = DB.find(BSimpleWithGen.class).findCount(); + final int count = DB.find(BSimpleFor.class).findCount(); assertThat(count).isEqualTo(0); } @Transactional private void doInsert() { - BSimpleWithGen bean = new BSimpleWithGen("doInsert"); + BSimpleFor bean = new BSimpleFor("doInsert"); DB.save(bean); } diff --git a/ebean-test/src/test/java/org/test/PlainBean.java b/ebean-test/src/test/java/org/etest/PlainBean.java similarity index 95% rename from ebean-test/src/test/java/org/test/PlainBean.java rename to ebean-test/src/test/java/org/etest/PlainBean.java index 103e67425..a86ba2c9f 100644 --- a/ebean-test/src/test/java/org/test/PlainBean.java +++ b/ebean-test/src/test/java/org/etest/PlainBean.java @@ -1,4 +1,4 @@ -package org.test; +package org.etest; import java.util.Objects; diff --git a/ebean-core/src/test/java/org/multitenant/partition/CurrentTenant.java b/ebean-test/src/test/java/org/multitenant/partition/CurrentTenant.java similarity index 100% rename from ebean-core/src/test/java/org/multitenant/partition/CurrentTenant.java rename to ebean-test/src/test/java/org/multitenant/partition/CurrentTenant.java diff --git a/ebean-core/src/test/java/org/multitenant/partition/MtBaseDomain.java b/ebean-test/src/test/java/org/multitenant/partition/MtBaseDomain.java similarity index 100% rename from ebean-core/src/test/java/org/multitenant/partition/MtBaseDomain.java rename to ebean-test/src/test/java/org/multitenant/partition/MtBaseDomain.java diff --git a/ebean-core/src/test/java/org/multitenant/partition/MtContent.java b/ebean-test/src/test/java/org/multitenant/partition/MtContent.java similarity index 100% rename from ebean-core/src/test/java/org/multitenant/partition/MtContent.java rename to ebean-test/src/test/java/org/multitenant/partition/MtContent.java diff --git a/ebean-core/src/test/java/org/multitenant/partition/MtTenant.java b/ebean-test/src/test/java/org/multitenant/partition/MtTenant.java similarity index 100% rename from ebean-core/src/test/java/org/multitenant/partition/MtTenant.java rename to ebean-test/src/test/java/org/multitenant/partition/MtTenant.java diff --git a/ebean-core/src/test/java/org/multitenant/partition/MtTenantAware.java b/ebean-test/src/test/java/org/multitenant/partition/MtTenantAware.java similarity index 100% rename from ebean-core/src/test/java/org/multitenant/partition/MtTenantAware.java rename to ebean-test/src/test/java/org/multitenant/partition/MtTenantAware.java diff --git a/ebean-core/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java b/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java similarity index 100% rename from ebean-core/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java rename to ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java diff --git a/ebean-core/src/test/java/org/multitenant/partition/UserContext.java b/ebean-test/src/test/java/org/multitenant/partition/UserContext.java similarity index 100% rename from ebean-core/src/test/java/org/multitenant/partition/UserContext.java rename to ebean-test/src/test/java/org/multitenant/partition/UserContext.java diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java similarity index 100% rename from ebean-core/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java rename to ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java similarity index 100% rename from ebean-core/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java rename to ebean-test/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java similarity index 100% rename from ebean-core/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java rename to ebean-test/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java similarity index 100% rename from ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java rename to ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java similarity index 100% rename from ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java rename to ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java diff --git a/ebean-core/src/test/java/org/tests/basic/MainDbBoolean.java b/ebean-test/src/test/java/org/tests/basic/MainDbBoolean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/MainDbBoolean.java rename to ebean-test/src/test/java/org/tests/basic/MainDbBoolean.java diff --git a/ebean-core/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java b/ebean-test/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java rename to ebean-test/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java b/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java rename to ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestAssocOneEqExpression.java b/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestAssocOneEqExpression.java rename to ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java b/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java rename to ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java b/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java rename to ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java b/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java rename to ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestCreateEntityBean.java b/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestCreateEntityBean.java rename to ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteByIdCollection.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestDeleteByIdCollection.java rename to ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java rename to ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteImportedPartial.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestDeleteImportedPartial.java rename to ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOne.java rename to ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java rename to ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java b/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java rename to ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java rename to ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java b/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java rename to ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestErrorBindLog.java b/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestErrorBindLog.java rename to ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java b/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java rename to ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestFetchId.java b/ebean-test/src/test/java/org/tests/basic/TestFetchId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestFetchId.java rename to ebean-test/src/test/java/org/tests/basic/TestFetchId.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestIUDVanilla.java b/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestIUDVanilla.java rename to ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestInEmpty.java b/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestInEmpty.java rename to ebean-test/src/test/java/org/tests/basic/TestInEmpty.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestInheritRef.java b/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestInheritRef.java rename to ebean-test/src/test/java/org/tests/basic/TestInheritRef.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java b/ebean-test/src/test/java/org/tests/basic/TestJodaType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestJodaType.java rename to ebean-test/src/test/java/org/tests/basic/TestJodaType.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestJoinInheritance.java b/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestJoinInheritance.java rename to ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java b/ebean-test/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java rename to ebean-test/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java b/ebean-test/src/test/java/org/tests/basic/TestLazyLoadInCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java rename to ebean-test/src/test/java/org/tests/basic/TestLazyLoadInCache.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestLimitQuery.java b/ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestLimitQuery.java rename to ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestLoadBeanCache.java b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestLoadBeanCache.java rename to ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestLogTransLogOnError.java b/ebean-test/src/test/java/org/tests/basic/TestLogTransLogOnError.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestLogTransLogOnError.java rename to ebean-test/src/test/java/org/tests/basic/TestLogTransLogOnError.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestM2MCascadeOne.java b/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestM2MCascadeOne.java rename to ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java b/ebean-test/src/test/java/org/tests/basic/TestM2MVanilla.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java rename to ebean-test/src/test/java/org/tests/basic/TestM2MVanilla.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java b/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java rename to ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java b/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java rename to ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestMappedSuper.java b/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestMappedSuper.java rename to ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestMetaAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestMetaAnnotation.java rename to ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java b/ebean-test/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java rename to ebean-test/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestNonUpdateProperty.java b/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestNonUpdateProperty.java rename to ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderByAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestOrderByAnnotation.java rename to ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java rename to ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java rename to ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java rename to ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java rename to ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java rename to ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java rename to ebean-test/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryUsingConnection.java b/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestQueryUsingConnection.java rename to ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryUsingDatabase.java b/ebean-test/src/test/java/org/tests/basic/TestQueryUsingDatabase.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestQueryUsingDatabase.java rename to ebean-test/src/test/java/org/tests/basic/TestQueryUsingDatabase.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWhereBetween.java b/ebean-test/src/test/java/org/tests/basic/TestQueryWhereBetween.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestQueryWhereBetween.java rename to ebean-test/src/test/java/org/tests/basic/TestQueryWhereBetween.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWhereInRange.java b/ebean-test/src/test/java/org/tests/basic/TestQueryWhereInRange.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestQueryWhereInRange.java rename to ebean-test/src/test/java/org/tests/basic/TestQueryWhereInRange.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java rename to ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java b/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java rename to ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java rename to ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java rename to ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java b/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java rename to ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestTransient.java b/ebean-test/src/test/java/org/tests/basic/TestTransient.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestTransient.java rename to ebean-test/src/test/java/org/tests/basic/TestTransient.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestUpdateManyToOne.java b/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestUpdateManyToOne.java rename to ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestUuidInsert.java b/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestUuidInsert.java rename to ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java b/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java rename to ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java diff --git a/ebean-core/src/test/java/org/tests/basic/TestWhereAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/TestWhereAnnotation.java rename to ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java rename to ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java rename to ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java rename to ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/BasicEncryptKey.java b/ebean-test/src/test/java/org/tests/basic/encrypt/BasicEncryptKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/encrypt/BasicEncryptKey.java rename to ebean-test/src/test/java/org/tests/basic/encrypt/BasicEncryptKey.java diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/BasicEncyptKeyManager.java b/ebean-test/src/test/java/org/tests/basic/encrypt/BasicEncyptKeyManager.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/encrypt/BasicEncyptKeyManager.java rename to ebean-test/src/test/java/org/tests/basic/encrypt/BasicEncyptKeyManager.java diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java rename to ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java rename to ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java rename to ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java diff --git a/ebean-core/src/test/java/org/tests/basic/event/TestPreInsertValidation.java b/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/event/TestPreInsertValidation.java rename to ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java diff --git a/ebean-core/src/test/java/org/tests/basic/event/TestQueryAdapter.java b/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/event/TestQueryAdapter.java rename to ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java diff --git a/ebean-core/src/test/java/org/tests/basic/join/TestSecondaryJoin.java b/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/join/TestSecondaryJoin.java rename to ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java diff --git a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java rename to ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java diff --git a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java rename to ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java diff --git a/ebean-core/src/test/java/org/tests/basic/lob/TestByteOnly.java b/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/lob/TestByteOnly.java rename to ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/Booking.java b/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/one2one/Booking.java rename to ebean-test/src/test/java/org/tests/basic/one2one/Booking.java diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/Invoice.java b/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/one2one/Invoice.java rename to ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java b/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java rename to ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java b/ebean-test/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java rename to ebean-test/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/Tire.java b/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/one2one/Tire.java rename to ebean-test/src/test/java/org/tests/basic/one2one/Tire.java diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/Wheel.java b/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/one2one/Wheel.java rename to ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java diff --git a/ebean-core/src/test/java/org/tests/basic/type/BSimpleWithGen.java b/ebean-test/src/test/java/org/tests/basic/type/BSimpleWithGen.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/type/BSimpleWithGen.java rename to ebean-test/src/test/java/org/tests/basic/type/BSimpleWithGen.java diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java b/ebean-test/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java rename to ebean-test/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java b/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java rename to ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestInetAddressType.java b/ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/type/TestInetAddressType.java rename to ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java b/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java rename to ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestSqlRowUUID.java b/ebean-test/src/test/java/org/tests/basic/type/TestSqlRowUUID.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/type/TestSqlRowUUID.java rename to ebean-test/src/test/java/org/tests/basic/type/TestSqlRowUUID.java diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestTransientMap.java b/ebean-test/src/test/java/org/tests/basic/type/TestTransientMap.java similarity index 100% rename from ebean-core/src/test/java/org/tests/basic/type/TestTransientMap.java rename to ebean-test/src/test/java/org/tests/basic/type/TestTransientMap.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java rename to ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java rename to ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java rename to ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java rename to ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java rename to ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java rename to ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java rename to ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java rename to ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java rename to ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java rename to ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java diff --git a/ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java rename to ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java b/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java rename to ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java b/ebean-test/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java rename to ebean-test/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java rename to ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java rename to ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java b/ebean-test/src/test/java/org/tests/batchload/TestBeanState.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestBeanState.java rename to ebean-test/src/test/java/org/tests/batchload/TestBeanState.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java b/ebean-test/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java rename to ebean-test/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java rename to ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java rename to ebean-test/src/test/java/org/tests/batchload/TestLazyJoin2.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java rename to ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java rename to ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java rename to ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java rename to ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java rename to ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java rename to ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java b/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java rename to ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java diff --git a/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java similarity index 100% rename from ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java rename to ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestBeanCache.java rename to ebean-test/src/test/java/org/tests/cache/TestBeanCache.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java rename to ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java rename to ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java b/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java rename to ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java b/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java rename to ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java b/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java rename to ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java b/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java rename to ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheDelete.java b/ebean-test/src/test/java/org/tests/cache/TestCacheDelete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestCacheDelete.java rename to ebean-test/src/test/java/org/tests/cache/TestCacheDelete.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheEmbeddedId.java b/ebean-test/src/test/java/org/tests/cache/TestCacheEmbeddedId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestCacheEmbeddedId.java rename to ebean-test/src/test/java/org/tests/cache/TestCacheEmbeddedId.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java b/ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java rename to ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheManyToOne.java b/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestCacheManyToOne.java rename to ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java b/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java rename to ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java b/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java rename to ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java b/ebean-test/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java rename to ebean-test/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java b/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java rename to ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestM2MCache.java b/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestM2MCache.java rename to ebean-test/src/test/java/org/tests/cache/TestM2MCache.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestQueryCache.java rename to ebean-test/src/test/java/org/tests/cache/TestQueryCache.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java rename to ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java rename to ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java rename to ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java rename to ebean-test/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java diff --git a/ebean-core/src/test/java/org/tests/cache/embeddedid/CEPCategory.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPCategory.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/embeddedid/CEPCategory.java rename to ebean-test/src/test/java/org/tests/cache/embeddedid/CEPCategory.java diff --git a/ebean-core/src/test/java/org/tests/cache/embeddedid/CEPProduct.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/embeddedid/CEPProduct.java rename to ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java diff --git a/ebean-core/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java rename to ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java diff --git a/ebean-core/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java rename to ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java diff --git a/ebean-core/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java rename to ebean-test/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java rename to ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java rename to ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java rename to ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonOther.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonOther.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/personinfo/PersonOther.java rename to ebean-test/src/test/java/org/tests/cache/personinfo/PersonOther.java diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java b/ebean-test/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java rename to ebean-test/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java diff --git a/ebean-core/src/test/java/org/tests/callable/TestMysqlCallable.java b/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java similarity index 100% rename from ebean-core/src/test/java/org/tests/callable/TestMysqlCallable.java rename to ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java diff --git a/ebean-core/src/test/java/org/tests/cascade/COOne.java b/ebean-test/src/test/java/org/tests/cascade/COOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/COOne.java rename to ebean-test/src/test/java/org/tests/cascade/COOne.java diff --git a/ebean-core/src/test/java/org/tests/cascade/COOneMany.java b/ebean-test/src/test/java/org/tests/cascade/COOneMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/COOneMany.java rename to ebean-test/src/test/java/org/tests/cascade/COOneMany.java diff --git a/ebean-core/src/test/java/org/tests/cascade/CORoot.java b/ebean-test/src/test/java/org/tests/cascade/CORoot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/CORoot.java rename to ebean-test/src/test/java/org/tests/cascade/CORoot.java diff --git a/ebean-core/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java rename to ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java diff --git a/ebean-core/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java rename to ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java diff --git a/ebean-core/src/test/java/org/tests/cascade/OmOrderedDetail.java b/ebean-test/src/test/java/org/tests/cascade/OmOrderedDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/OmOrderedDetail.java rename to ebean-test/src/test/java/org/tests/cascade/OmOrderedDetail.java diff --git a/ebean-core/src/test/java/org/tests/cascade/OmOrderedMaster.java b/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/OmOrderedMaster.java rename to ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java diff --git a/ebean-core/src/test/java/org/tests/cascade/RelDetail.java b/ebean-test/src/test/java/org/tests/cascade/RelDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/RelDetail.java rename to ebean-test/src/test/java/org/tests/cascade/RelDetail.java diff --git a/ebean-core/src/test/java/org/tests/cascade/RelMaster.java b/ebean-test/src/test/java/org/tests/cascade/RelMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/RelMaster.java rename to ebean-test/src/test/java/org/tests/cascade/RelMaster.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java b/ebean-test/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java rename to ebean-test/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java b/ebean-test/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java rename to ebean-test/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java b/ebean-test/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java rename to ebean-test/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestMasterDetailDelete.java b/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestMasterDetailDelete.java rename to ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java b/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java rename to ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java b/ebean-test/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java rename to ebean-test/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java b/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java rename to ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwned.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestPrivateOwned.java rename to ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java rename to ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java rename to ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java similarity index 100% rename from ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java rename to ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java diff --git a/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java b/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java rename to ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java diff --git a/ebean-core/src/test/java/org/tests/changelog/TestChangeLogInt.java b/ebean-test/src/test/java/org/tests/changelog/TestChangeLogInt.java similarity index 100% rename from ebean-core/src/test/java/org/tests/changelog/TestChangeLogInt.java rename to ebean-test/src/test/java/org/tests/changelog/TestChangeLogInt.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyDelete.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyDelete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/TestCKeyDelete.java rename to ebean-test/src/test/java/org/tests/compositekeys/TestCKeyDelete.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java rename to ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java rename to ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java rename to ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCore.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCore.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/TestCore.java rename to ebean-test/src/test/java/org/tests/compositekeys/TestCore.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java rename to ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/AuditInfo.java b/ebean-test/src/test/java/org/tests/compositekeys/db/AuditInfo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/AuditInfo.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/AuditInfo.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/CaoBean.java b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/CaoBean.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/CaoKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/CaoKey.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/CaoKey.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/Item.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/Item.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/Item.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/ItemKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/ItemKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/ItemKey.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/ItemKey.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/Parcel.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Parcel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/Parcel.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/Parcel.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/ParcelLocation.java b/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/ParcelLocation.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/Region.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/Region.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/Region.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/RegionKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/RegionKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/RegionKey.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/RegionKey.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/SubType.java b/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/SubType.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/SubTypeKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/SubTypeKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/SubTypeKey.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/SubTypeKey.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/Type.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/Type.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/Type.java diff --git a/ebean-core/src/test/java/org/tests/compositekeys/db/TypeKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/TypeKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/compositekeys/db/TypeKey.java rename to ebean-test/src/test/java/org/tests/compositekeys/db/TypeKey.java diff --git a/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java b/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java similarity index 100% rename from ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java rename to ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java b/ebean-test/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java rename to ebean-test/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java b/ebean-test/src/test/java/org/tests/ddd/iud/TestDPersonEl.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java rename to ebean-test/src/test/java/org/tests/ddd/iud/TestDPersonEl.java diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java b/ebean-test/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java rename to ebean-test/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java diff --git a/ebean-core/src/test/java/org/tests/ddl/DfkCascade.java b/ebean-test/src/test/java/org/tests/ddl/DfkCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddl/DfkCascade.java rename to ebean-test/src/test/java/org/tests/ddl/DfkCascade.java diff --git a/ebean-core/src/test/java/org/tests/ddl/DfkCascadeOne.java b/ebean-test/src/test/java/org/tests/ddl/DfkCascadeOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddl/DfkCascadeOne.java rename to ebean-test/src/test/java/org/tests/ddl/DfkCascadeOne.java diff --git a/ebean-core/src/test/java/org/tests/ddl/DfkNone.java b/ebean-test/src/test/java/org/tests/ddl/DfkNone.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddl/DfkNone.java rename to ebean-test/src/test/java/org/tests/ddl/DfkNone.java diff --git a/ebean-core/src/test/java/org/tests/ddl/DfkNoneViaJoin.java b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddl/DfkNoneViaJoin.java rename to ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java diff --git a/ebean-core/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java rename to ebean-test/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java diff --git a/ebean-core/src/test/java/org/tests/ddl/DfkOne.java b/ebean-test/src/test/java/org/tests/ddl/DfkOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddl/DfkOne.java rename to ebean-test/src/test/java/org/tests/ddl/DfkOne.java diff --git a/ebean-core/src/test/java/org/tests/ddl/DfkSetNull.java b/ebean-test/src/test/java/org/tests/ddl/DfkSetNull.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddl/DfkSetNull.java rename to ebean-test/src/test/java/org/tests/ddl/DfkSetNull.java diff --git a/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java b/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java similarity index 100% rename from ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java rename to ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java diff --git a/ebean-core/src/test/java/org/tests/defaultvalues/DefaultsModel.java b/ebean-test/src/test/java/org/tests/defaultvalues/DefaultsModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/defaultvalues/DefaultsModel.java rename to ebean-test/src/test/java/org/tests/defaultvalues/DefaultsModel.java diff --git a/ebean-core/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java b/ebean-test/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java rename to ebean-test/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java diff --git a/ebean-core/src/test/java/org/tests/defaultvalues/TestDefaults.java b/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java similarity index 100% rename from ebean-core/src/test/java/org/tests/defaultvalues/TestDefaults.java rename to ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java diff --git a/ebean-core/src/test/java/org/tests/delete/DcDetail.java b/ebean-test/src/test/java/org/tests/delete/DcDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/delete/DcDetail.java rename to ebean-test/src/test/java/org/tests/delete/DcDetail.java diff --git a/ebean-core/src/test/java/org/tests/delete/DcListener.java b/ebean-test/src/test/java/org/tests/delete/DcListener.java similarity index 100% rename from ebean-core/src/test/java/org/tests/delete/DcListener.java rename to ebean-test/src/test/java/org/tests/delete/DcListener.java diff --git a/ebean-core/src/test/java/org/tests/delete/DcMaster.java b/ebean-test/src/test/java/org/tests/delete/DcMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/delete/DcMaster.java rename to ebean-test/src/test/java/org/tests/delete/DcMaster.java diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java rename to ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java similarity index 100% rename from ebean-core/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java rename to ebean-test/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteByQuery.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/delete/TestDeleteByQuery.java rename to ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java similarity index 100% rename from ebean-core/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java rename to ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java similarity index 100% rename from ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java rename to ebean-test/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java diff --git a/ebean-core/src/test/java/org/tests/docstore/CustomerReportTest.java b/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/docstore/CustomerReportTest.java rename to ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java diff --git a/ebean-core/src/test/java/org/tests/draftable/DocLinkTest.java b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/draftable/DocLinkTest.java rename to ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java diff --git a/ebean-core/src/test/java/org/tests/draftable/LinkQueryPublishTest.java b/ebean-test/src/test/java/org/tests/draftable/LinkQueryPublishTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/draftable/LinkQueryPublishTest.java rename to ebean-test/src/test/java/org/tests/draftable/LinkQueryPublishTest.java diff --git a/ebean-core/src/test/java/org/tests/draftable/OrganisationTest.java b/ebean-test/src/test/java/org/tests/draftable/OrganisationTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/draftable/OrganisationTest.java rename to ebean-test/src/test/java/org/tests/draftable/OrganisationTest.java diff --git a/ebean-core/src/test/java/org/tests/el/TestELBasic.java b/ebean-test/src/test/java/org/tests/el/TestELBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/el/TestELBasic.java rename to ebean-test/src/test/java/org/tests/el/TestELBasic.java diff --git a/ebean-core/src/test/java/org/tests/el/TestPathExpression.java b/ebean-test/src/test/java/org/tests/el/TestPathExpression.java similarity index 100% rename from ebean-core/src/test/java/org/tests/el/TestPathExpression.java rename to ebean-test/src/test/java/org/tests/el/TestPathExpression.java diff --git a/ebean-core/src/test/java/org/tests/el/TestUnderscoreParam.java b/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java similarity index 100% rename from ebean-core/src/test/java/org/tests/el/TestUnderscoreParam.java rename to ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java diff --git a/ebean-core/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java b/ebean-test/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java rename to ebean-test/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java diff --git a/ebean-core/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java similarity index 100% rename from ebean-core/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java rename to ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java diff --git a/ebean-core/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java similarity index 100% rename from ebean-core/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java rename to ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java diff --git a/ebean-core/src/test/java/org/tests/enhancement/TestEnhancementEquals.java b/ebean-test/src/test/java/org/tests/enhancement/TestEnhancementEquals.java similarity index 100% rename from ebean-core/src/test/java/org/tests/enhancement/TestEnhancementEquals.java rename to ebean-test/src/test/java/org/tests/enhancement/TestEnhancementEquals.java diff --git a/ebean-core/src/test/java/org/tests/example/ModUuidGenerator.java b/ebean-test/src/test/java/org/tests/example/ModUuidGenerator.java similarity index 100% rename from ebean-core/src/test/java/org/tests/example/ModUuidGenerator.java rename to ebean-test/src/test/java/org/tests/example/ModUuidGenerator.java diff --git a/ebean-core/src/test/java/org/tests/expression/bitwise/BwBean.java b/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/expression/bitwise/BwBean.java rename to ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java diff --git a/ebean-core/src/test/java/org/tests/expression/bitwise/BwFlags.java b/ebean-test/src/test/java/org/tests/expression/bitwise/BwFlags.java similarity index 100% rename from ebean-core/src/test/java/org/tests/expression/bitwise/BwFlags.java rename to ebean-test/src/test/java/org/tests/expression/bitwise/BwFlags.java diff --git a/ebean-core/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java b/ebean-test/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java similarity index 100% rename from ebean-core/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java rename to ebean-test/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java diff --git a/ebean-core/src/test/java/org/tests/family/TestInheritance.java b/ebean-test/src/test/java/org/tests/family/TestInheritance.java similarity index 100% rename from ebean-core/src/test/java/org/tests/family/TestInheritance.java rename to ebean-test/src/test/java/org/tests/family/TestInheritance.java diff --git a/ebean-core/src/test/java/org/tests/generated/TestGeneratedProperties.java b/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java similarity index 100% rename from ebean-core/src/test/java/org/tests/generated/TestGeneratedProperties.java rename to ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java diff --git a/ebean-core/src/test/java/org/tests/generated/TestGeneratedWho.java b/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java similarity index 100% rename from ebean-core/src/test/java/org/tests/generated/TestGeneratedWho.java rename to ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java diff --git a/ebean-core/src/test/java/org/tests/genkey/TestGeneratedKeys.java b/ebean-test/src/test/java/org/tests/genkey/TestGeneratedKeys.java similarity index 100% rename from ebean-core/src/test/java/org/tests/genkey/TestGeneratedKeys.java rename to ebean-test/src/test/java/org/tests/genkey/TestGeneratedKeys.java diff --git a/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java b/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java similarity index 100% rename from ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java rename to ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java diff --git a/ebean-core/src/test/java/org/tests/history/TestHistoryInsert.java b/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/history/TestHistoryInsert.java rename to ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestCustomId.java b/ebean-test/src/test/java/org/tests/idkeys/TestCustomId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/idkeys/TestCustomId.java rename to ebean-test/src/test/java/org/tests/idkeys/TestCustomId.java diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestGeneratedKeys.java b/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java similarity index 100% rename from ebean-core/src/test/java/org/tests/idkeys/TestGeneratedKeys.java rename to ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestLazyLoad.java b/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/idkeys/TestLazyLoad.java rename to ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java b/ebean-test/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java rename to ebean-test/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java diff --git a/ebean-core/src/test/java/org/tests/idkeys/db/AuditLog.java b/ebean-test/src/test/java/org/tests/idkeys/db/AuditLog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/idkeys/db/AuditLog.java rename to ebean-test/src/test/java/org/tests/idkeys/db/AuditLog.java diff --git a/ebean-core/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java rename to ebean-test/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java diff --git a/ebean-core/src/test/java/org/tests/idkeys/db/GenKeySequence.java b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySequence.java similarity index 100% rename from ebean-core/src/test/java/org/tests/idkeys/db/GenKeySequence.java rename to ebean-test/src/test/java/org/tests/idkeys/db/GenKeySequence.java diff --git a/ebean-core/src/test/java/org/tests/inherit/ChildA.java b/ebean-test/src/test/java/org/tests/inherit/ChildA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/ChildA.java rename to ebean-test/src/test/java/org/tests/inherit/ChildA.java diff --git a/ebean-core/src/test/java/org/tests/inherit/ChildB.java b/ebean-test/src/test/java/org/tests/inherit/ChildB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/ChildB.java rename to ebean-test/src/test/java/org/tests/inherit/ChildB.java diff --git a/ebean-core/src/test/java/org/tests/inherit/DIntChild1.java b/ebean-test/src/test/java/org/tests/inherit/DIntChild1.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/DIntChild1.java rename to ebean-test/src/test/java/org/tests/inherit/DIntChild1.java diff --git a/ebean-core/src/test/java/org/tests/inherit/DIntChild2.java b/ebean-test/src/test/java/org/tests/inherit/DIntChild2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/DIntChild2.java rename to ebean-test/src/test/java/org/tests/inherit/DIntChild2.java diff --git a/ebean-core/src/test/java/org/tests/inherit/DIntChildBase.java b/ebean-test/src/test/java/org/tests/inherit/DIntChildBase.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/DIntChildBase.java rename to ebean-test/src/test/java/org/tests/inherit/DIntChildBase.java diff --git a/ebean-core/src/test/java/org/tests/inherit/DIntParent.java b/ebean-test/src/test/java/org/tests/inherit/DIntParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/DIntParent.java rename to ebean-test/src/test/java/org/tests/inherit/DIntParent.java diff --git a/ebean-core/src/test/java/org/tests/inherit/Data.java b/ebean-test/src/test/java/org/tests/inherit/Data.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/Data.java rename to ebean-test/src/test/java/org/tests/inherit/Data.java diff --git a/ebean-core/src/test/java/org/tests/inherit/EUncle.java b/ebean-test/src/test/java/org/tests/inherit/EUncle.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/EUncle.java rename to ebean-test/src/test/java/org/tests/inherit/EUncle.java diff --git a/ebean-core/src/test/java/org/tests/inherit/InheritDiscIntTest.java b/ebean-test/src/test/java/org/tests/inherit/InheritDiscIntTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/InheritDiscIntTest.java rename to ebean-test/src/test/java/org/tests/inherit/InheritDiscIntTest.java diff --git a/ebean-core/src/test/java/org/tests/inherit/Parent.java b/ebean-test/src/test/java/org/tests/inherit/Parent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/Parent.java rename to ebean-test/src/test/java/org/tests/inherit/Parent.java diff --git a/ebean-core/src/test/java/org/tests/inherit/ParentAggregate.java b/ebean-test/src/test/java/org/tests/inherit/ParentAggregate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inherit/ParentAggregate.java rename to ebean-test/src/test/java/org/tests/inherit/ParentAggregate.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/InnerReport.java b/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/InnerReport.java rename to ebean-test/src/test/java/org/tests/inheritance/InnerReport.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/OrganizationNode.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/OrganizationNode.java rename to ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/OrganizationTreeNode.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationTreeNode.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/OrganizationTreeNode.java rename to ebean-test/src/test/java/org/tests/inheritance/OrganizationTreeNode.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/OrganizationUnit.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationUnit.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/OrganizationUnit.java rename to ebean-test/src/test/java/org/tests/inheritance/OrganizationUnit.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/Stockforecast.java b/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/Stockforecast.java rename to ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java b/ebean-test/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java rename to ebean-test/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritInsert.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritInsert.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceJoins.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritanceJoins.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceQuery.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritanceQuery.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java rename to ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java b/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java rename to ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java b/ebean-test/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java rename to ebean-test/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestSkippable.java b/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestSkippable.java rename to ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestTreeOrganisations.java b/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/TestTreeOrganisations.java rename to ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java rename to ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/abstrakt/Block.java b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/Block.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/abstrakt/Block.java rename to ebean-test/src/test/java/org/tests/inheritance/abstrakt/Block.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java rename to ebean-test/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/SourceA.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/bothsides/SourceA.java rename to ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceA.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/SourceB.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/bothsides/SourceB.java rename to ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceB.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/SourceBase.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceBase.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/bothsides/SourceBase.java rename to ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceBase.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/Target1.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/bothsides/Target1.java rename to ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/Target2.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/bothsides/Target2.java rename to ebean-test/src/test/java/org/tests/inheritance/bothsides/Target2.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/TargetBase.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TargetBase.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/bothsides/TargetBase.java rename to ebean-test/src/test/java/org/tests/inheritance/bothsides/TargetBase.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java rename to ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java rename to ebean-test/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/CIAddress.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIAddress.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/CIAddress.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/CIAddress.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/CIBaseModel.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIBaseModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/CIBaseModel.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/CIBaseModel.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/CICustomer.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/CICustomer.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/CICustomer.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/CICustomerParent.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/CICustomerParent.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/CIStreet.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreet.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/CIStreet.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/CIStreet.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/CIStreetParent.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/CIStreetParent.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java rename to ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java rename to ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java rename to ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java rename to ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java rename to ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java rename to ebean-test/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java rename to ebean-test/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java rename to ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java rename to ebean-test/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/company/domain/Foo.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/company/domain/Foo.java rename to ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java rename to ebean-test/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java b/ebean-test/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java rename to ebean-test/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/CalculationResult.java b/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/model/CalculationResult.java rename to ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/Configuration.java b/ebean-test/src/test/java/org/tests/inheritance/model/Configuration.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/model/Configuration.java rename to ebean-test/src/test/java/org/tests/inheritance/model/Configuration.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/Configurations.java b/ebean-test/src/test/java/org/tests/inheritance/model/Configurations.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/model/Configurations.java rename to ebean-test/src/test/java/org/tests/inheritance/model/Configurations.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/GroupConfiguration.java b/ebean-test/src/test/java/org/tests/inheritance/model/GroupConfiguration.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/model/GroupConfiguration.java rename to ebean-test/src/test/java/org/tests/inheritance/model/GroupConfiguration.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/ProductConfiguration.java b/ebean-test/src/test/java/org/tests/inheritance/model/ProductConfiguration.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/model/ProductConfiguration.java rename to ebean-test/src/test/java/org/tests/inheritance/model/ProductConfiguration.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java rename to ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/order/OrderedA.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/order/OrderedA.java rename to ebean-test/src/test/java/org/tests/inheritance/order/OrderedA.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/order/OrderedB.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/order/OrderedB.java rename to ebean-test/src/test/java/org/tests/inheritance/order/OrderedB.java diff --git a/ebean-core/src/test/java/org/tests/inheritance/order/OrderedParent.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/inheritance/order/OrderedParent.java rename to ebean-test/src/test/java/org/tests/inheritance/order/OrderedParent.java diff --git a/ebean-core/src/test/java/org/tests/insert/EIdUidBean.java b/ebean-test/src/test/java/org/tests/insert/EIdUidBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/EIdUidBean.java rename to ebean-test/src/test/java/org/tests/insert/EIdUidBean.java diff --git a/ebean-core/src/test/java/org/tests/insert/MainDbCopy.java b/ebean-test/src/test/java/org/tests/insert/MainDbCopy.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/MainDbCopy.java rename to ebean-test/src/test/java/org/tests/insert/MainDbCopy.java diff --git a/ebean-core/src/test/java/org/tests/insert/OnlyIdEntity.java b/ebean-test/src/test/java/org/tests/insert/OnlyIdEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/OnlyIdEntity.java rename to ebean-test/src/test/java/org/tests/insert/OnlyIdEntity.java diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertCheckUnique.java b/ebean-test/src/test/java/org/tests/insert/TestInsertCheckUnique.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/TestInsertCheckUnique.java rename to ebean-test/src/test/java/org/tests/insert/TestInsertCheckUnique.java diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertCollection.java b/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/TestInsertCollection.java rename to ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java b/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java rename to ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java b/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java rename to ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertOnStringKey.java b/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/TestInsertOnStringKey.java rename to ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java b/ebean-test/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java rename to ebean-test/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java diff --git a/ebean-core/src/test/java/org/tests/insert/TestOnlyIdEntity.java b/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/TestOnlyIdEntity.java rename to ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java diff --git a/ebean-core/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java b/ebean-test/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java similarity index 100% rename from ebean-core/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java rename to ebean-test/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java diff --git a/ebean-core/src/test/java/org/tests/iud/PcfCalendar.java b/ebean-test/src/test/java/org/tests/iud/PcfCalendar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/PcfCalendar.java rename to ebean-test/src/test/java/org/tests/iud/PcfCalendar.java diff --git a/ebean-core/src/test/java/org/tests/iud/PcfCity.java b/ebean-test/src/test/java/org/tests/iud/PcfCity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/PcfCity.java rename to ebean-test/src/test/java/org/tests/iud/PcfCity.java diff --git a/ebean-core/src/test/java/org/tests/iud/PcfCountry.java b/ebean-test/src/test/java/org/tests/iud/PcfCountry.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/PcfCountry.java rename to ebean-test/src/test/java/org/tests/iud/PcfCountry.java diff --git a/ebean-core/src/test/java/org/tests/iud/PcfEvent.java b/ebean-test/src/test/java/org/tests/iud/PcfEvent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/PcfEvent.java rename to ebean-test/src/test/java/org/tests/iud/PcfEvent.java diff --git a/ebean-core/src/test/java/org/tests/iud/PcfModel.java b/ebean-test/src/test/java/org/tests/iud/PcfModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/PcfModel.java rename to ebean-test/src/test/java/org/tests/iud/PcfModel.java diff --git a/ebean-core/src/test/java/org/tests/iud/PcfPerson.java b/ebean-test/src/test/java/org/tests/iud/PcfPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/PcfPerson.java rename to ebean-test/src/test/java/org/tests/iud/PcfPerson.java diff --git a/ebean-core/src/test/java/org/tests/iud/TestCarWheelIud.java b/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/TestCarWheelIud.java rename to ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java diff --git a/ebean-core/src/test/java/org/tests/iud/TestInfoOneToOne.java b/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/TestInfoOneToOne.java rename to ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java diff --git a/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java b/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java rename to ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java diff --git a/ebean-core/src/test/java/org/tests/iud/TestInsertUpdateTrans.java b/ebean-test/src/test/java/org/tests/iud/TestInsertUpdateTrans.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/TestInsertUpdateTrans.java rename to ebean-test/src/test/java/org/tests/iud/TestInsertUpdateTrans.java diff --git a/ebean-core/src/test/java/org/tests/iud/TestPersistCascade.java b/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/iud/TestPersistCascade.java rename to ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java rename to ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson.java diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java rename to ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson2.java diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java rename to ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestDbJson_List.java rename to ebean-test/src/test/java/org/tests/json/TestDbJson_List.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapBasic.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonMapBasic.java rename to ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapBlob.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonMapBlob.java rename to ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapClob.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonMapClob.java rename to ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapJsonB.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonMapJsonB.java rename to ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapVarchar.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonMapVarchar.java rename to ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java rename to ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java rename to ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java rename to ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java rename to ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java b/ebean-test/src/test/java/org/tests/json/TestJsonNullValues.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java rename to ebean-test/src/test/java/org/tests/json/TestJsonNullValues.java diff --git a/ebean-core/src/test/java/org/tests/json/TestOldValue.java b/ebean-test/src/test/java/org/tests/json/TestOldValue.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestOldValue.java rename to ebean-test/src/test/java/org/tests/json/TestOldValue.java diff --git a/ebean-core/src/test/java/org/tests/json/TestUnmappedProperties.java b/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/TestUnmappedProperties.java rename to ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java rename to ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java rename to ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java rename to ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeNull.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeNull.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeNull.java rename to ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeNull.java diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java rename to ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/ModelA.java b/ebean-test/src/test/java/org/tests/json/transientproperties/ModelA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/ModelA.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/ModelA.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/ModelB.java b/ebean-test/src/test/java/org/tests/json/transientproperties/ModelB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/ModelB.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/ModelB.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java b/ebean-test/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestModelAJson.java b/ebean-test/src/test/java/org/tests/json/transientproperties/TestModelAJson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/TestModelAJson.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/TestModelAJson.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java b/ebean-test/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java b/ebean-test/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java rename to ebean-test/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java diff --git a/ebean-core/src/test/java/org/tests/lazyforeignkeys/MainEntity.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lazyforeignkeys/MainEntity.java rename to ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntity.java diff --git a/ebean-core/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java rename to ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java diff --git a/ebean-core/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java rename to ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java diff --git a/ebean-core/src/test/java/org/tests/lazyloadconf/AppConfig.java b/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfig.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lazyloadconf/AppConfig.java rename to ebean-test/src/test/java/org/tests/lazyloadconf/AppConfig.java diff --git a/ebean-core/src/test/java/org/tests/lazyloadconf/AppConfigControl.java b/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfigControl.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lazyloadconf/AppConfigControl.java rename to ebean-test/src/test/java/org/tests/lazyloadconf/AppConfigControl.java diff --git a/ebean-core/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java b/ebean-test/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java rename to ebean-test/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java diff --git a/ebean-core/src/test/java/org/tests/lazyloadconf/Relationship.java b/ebean-test/src/test/java/org/tests/lazyloadconf/Relationship.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lazyloadconf/Relationship.java rename to ebean-test/src/test/java/org/tests/lazyloadconf/Relationship.java diff --git a/ebean-core/src/test/java/org/tests/level/Level1.java b/ebean-test/src/test/java/org/tests/level/Level1.java similarity index 100% rename from ebean-core/src/test/java/org/tests/level/Level1.java rename to ebean-test/src/test/java/org/tests/level/Level1.java diff --git a/ebean-core/src/test/java/org/tests/level/Level2.java b/ebean-test/src/test/java/org/tests/level/Level2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/level/Level2.java rename to ebean-test/src/test/java/org/tests/level/Level2.java diff --git a/ebean-core/src/test/java/org/tests/level/Level3.java b/ebean-test/src/test/java/org/tests/level/Level3.java similarity index 100% rename from ebean-core/src/test/java/org/tests/level/Level3.java rename to ebean-test/src/test/java/org/tests/level/Level3.java diff --git a/ebean-core/src/test/java/org/tests/level/Level4.java b/ebean-test/src/test/java/org/tests/level/Level4.java similarity index 100% rename from ebean-core/src/test/java/org/tests/level/Level4.java rename to ebean-test/src/test/java/org/tests/level/Level4.java diff --git a/ebean-core/src/test/java/org/tests/level/test/ManyToManyTest.java b/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/level/test/ManyToManyTest.java rename to ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java rename to ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java rename to ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java rename to ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MModifyTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2MModifyTest.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MMultipleLists.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2MMultipleLists.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java b/ebean-test/src/test/java/org/tests/m2m/TestM2mDeleteObject.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java rename to ebean-test/src/test/java/org/tests/m2m/TestM2mDeleteObject.java diff --git a/ebean-core/src/test/java/org/tests/m2m/softdelete/MsManyA.java b/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/softdelete/MsManyA.java rename to ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyA.java diff --git a/ebean-core/src/test/java/org/tests/m2m/softdelete/MsManyB.java b/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/softdelete/MsManyB.java rename to ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyB.java diff --git a/ebean-core/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java b/ebean-test/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java similarity index 100% rename from ebean-core/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java rename to ebean-test/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java diff --git a/ebean-core/src/test/java/org/tests/merge/MAddress.java b/ebean-test/src/test/java/org/tests/merge/MAddress.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/MAddress.java rename to ebean-test/src/test/java/org/tests/merge/MAddress.java diff --git a/ebean-core/src/test/java/org/tests/merge/MBase.java b/ebean-test/src/test/java/org/tests/merge/MBase.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/MBase.java rename to ebean-test/src/test/java/org/tests/merge/MBase.java diff --git a/ebean-core/src/test/java/org/tests/merge/MContact.java b/ebean-test/src/test/java/org/tests/merge/MContact.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/MContact.java rename to ebean-test/src/test/java/org/tests/merge/MContact.java diff --git a/ebean-core/src/test/java/org/tests/merge/MContactMessage.java b/ebean-test/src/test/java/org/tests/merge/MContactMessage.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/MContactMessage.java rename to ebean-test/src/test/java/org/tests/merge/MContactMessage.java diff --git a/ebean-core/src/test/java/org/tests/merge/MCustomer.java b/ebean-test/src/test/java/org/tests/merge/MCustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/MCustomer.java rename to ebean-test/src/test/java/org/tests/merge/MCustomer.java diff --git a/ebean-core/src/test/java/org/tests/merge/MGroup.java b/ebean-test/src/test/java/org/tests/merge/MGroup.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/MGroup.java rename to ebean-test/src/test/java/org/tests/merge/MGroup.java diff --git a/ebean-core/src/test/java/org/tests/merge/MMachine.java b/ebean-test/src/test/java/org/tests/merge/MMachine.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/MMachine.java rename to ebean-test/src/test/java/org/tests/merge/MMachine.java diff --git a/ebean-core/src/test/java/org/tests/merge/TestMergeBasic.java b/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/TestMergeBasic.java rename to ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java diff --git a/ebean-core/src/test/java/org/tests/merge/TestMergeCustomer.java b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/TestMergeCustomer.java rename to ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java diff --git a/ebean-core/src/test/java/org/tests/merge/TestMergeM2M.java b/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java similarity index 100% rename from ebean-core/src/test/java/org/tests/merge/TestMergeM2M.java rename to ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java diff --git a/ebean-core/src/test/java/org/tests/mockito/TestMockitoMock.java b/ebean-test/src/test/java/org/tests/mockito/TestMockitoMock.java similarity index 100% rename from ebean-core/src/test/java/org/tests/mockito/TestMockitoMock.java rename to ebean-test/src/test/java/org/tests/mockito/TestMockitoMock.java diff --git a/ebean-core/src/test/java/org/tests/model/BaseModel.java b/ebean-test/src/test/java/org/tests/model/BaseModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/BaseModel.java rename to ebean-test/src/test/java/org/tests/model/BaseModel.java diff --git a/ebean-core/src/test/java/org/tests/model/EGenProps.java b/ebean-test/src/test/java/org/tests/model/EGenProps.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/EGenProps.java rename to ebean-test/src/test/java/org/tests/model/EGenProps.java diff --git a/ebean-core/src/test/java/org/tests/model/EWhoProps.java b/ebean-test/src/test/java/org/tests/model/EWhoProps.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/EWhoProps.java rename to ebean-test/src/test/java/org/tests/model/EWhoProps.java diff --git a/ebean-core/src/test/java/org/tests/model/EWhoPropsSuper.java b/ebean-test/src/test/java/org/tests/model/EWhoPropsSuper.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/EWhoPropsSuper.java rename to ebean-test/src/test/java/org/tests/model/EWhoPropsSuper.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/DMachine.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/DMachine.java rename to ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java rename to ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java rename to ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/DMachineStats.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/DMachineStats.java rename to ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java rename to ebean-test/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/DMachineUse.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/DMachineUse.java rename to ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/DOrg.java b/ebean-test/src/test/java/org/tests/model/aggregation/DOrg.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/DOrg.java rename to ebean-test/src/test/java/org/tests/model/aggregation/DOrg.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/Decimal93.java b/ebean-test/src/test/java/org/tests/model/aggregation/Decimal93.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/Decimal93.java rename to ebean-test/src/test/java/org/tests/model/aggregation/Decimal93.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/MachineUseData.java b/ebean-test/src/test/java/org/tests/model/aggregation/MachineUseData.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/MachineUseData.java rename to ebean-test/src/test/java/org/tests/model/aggregation/MachineUseData.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationMany.java b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationMany.java rename to ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java rename to ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java diff --git a/ebean-core/src/test/java/org/tests/model/array/EArrayBean.java b/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/array/EArrayBean.java rename to ebean-test/src/test/java/org/tests/model/array/EArrayBean.java diff --git a/ebean-core/src/test/java/org/tests/model/array/EArraySetBean.java b/ebean-test/src/test/java/org/tests/model/array/EArraySetBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/array/EArraySetBean.java rename to ebean-test/src/test/java/org/tests/model/array/EArraySetBean.java diff --git a/ebean-core/src/test/java/org/tests/model/array/IntEnum.java b/ebean-test/src/test/java/org/tests/model/array/IntEnum.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/array/IntEnum.java rename to ebean-test/src/test/java/org/tests/model/array/IntEnum.java diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java rename to ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java rename to ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java diff --git a/ebean-core/src/test/java/org/tests/model/array/VarcharEnum.java b/ebean-test/src/test/java/org/tests/model/array/VarcharEnum.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/array/VarcharEnum.java rename to ebean-test/src/test/java/org/tests/model/array/VarcharEnum.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Address.java b/ebean-test/src/test/java/org/tests/model/basic/Address.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Address.java rename to ebean-test/src/test/java/org/tests/model/basic/Address.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Animal.java b/ebean-test/src/test/java/org/tests/model/basic/Animal.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Animal.java rename to ebean-test/src/test/java/org/tests/model/basic/Animal.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/AnimalShelter.java b/ebean-test/src/test/java/org/tests/model/basic/AnimalShelter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/AnimalShelter.java rename to ebean-test/src/test/java/org/tests/model/basic/AnimalShelter.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Article.java b/ebean-test/src/test/java/org/tests/model/basic/Article.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Article.java rename to ebean-test/src/test/java/org/tests/model/basic/Article.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Attribute.java b/ebean-test/src/test/java/org/tests/model/basic/Attribute.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Attribute.java rename to ebean-test/src/test/java/org/tests/model/basic/Attribute.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/AttributeHolder.java b/ebean-test/src/test/java/org/tests/model/basic/AttributeHolder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/AttributeHolder.java rename to ebean-test/src/test/java/org/tests/model/basic/AttributeHolder.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/BBookmark.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/BBookmark.java rename to ebean-test/src/test/java/org/tests/model/basic/BBookmark.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/BBookmarkOrg.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmarkOrg.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/BBookmarkOrg.java rename to ebean-test/src/test/java/org/tests/model/basic/BBookmarkOrg.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/BBookmarkUser.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmarkUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/BBookmarkUser.java rename to ebean-test/src/test/java/org/tests/model/basic/BBookmarkUser.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/BWithQIdent.java b/ebean-test/src/test/java/org/tests/model/basic/BWithQIdent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/BWithQIdent.java rename to ebean-test/src/test/java/org/tests/model/basic/BWithQIdent.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/BasicDomain.java b/ebean-test/src/test/java/org/tests/model/basic/BasicDomain.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/BasicDomain.java rename to ebean-test/src/test/java/org/tests/model/basic/BasicDomain.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/BeanWithTimeZone.java b/ebean-test/src/test/java/org/tests/model/basic/BeanWithTimeZone.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/BeanWithTimeZone.java rename to ebean-test/src/test/java/org/tests/model/basic/BeanWithTimeZone.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/BigDog.java b/ebean-test/src/test/java/org/tests/model/basic/BigDog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/BigDog.java rename to ebean-test/src/test/java/org/tests/model/basic/BigDog.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/CKeyAssoc.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyAssoc.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/CKeyAssoc.java rename to ebean-test/src/test/java/org/tests/model/basic/CKeyAssoc.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/CKeyDetail.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/CKeyDetail.java rename to ebean-test/src/test/java/org/tests/model/basic/CKeyDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/CKeyParent.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/CKeyParent.java rename to ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/CKeyParentId.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyParentId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/CKeyParentId.java rename to ebean-test/src/test/java/org/tests/model/basic/CKeyParentId.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Car.java b/ebean-test/src/test/java/org/tests/model/basic/Car.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Car.java rename to ebean-test/src/test/java/org/tests/model/basic/Car.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/CarAccessory.java b/ebean-test/src/test/java/org/tests/model/basic/CarAccessory.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/CarAccessory.java rename to ebean-test/src/test/java/org/tests/model/basic/CarAccessory.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/CarFuse.java b/ebean-test/src/test/java/org/tests/model/basic/CarFuse.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/CarFuse.java rename to ebean-test/src/test/java/org/tests/model/basic/CarFuse.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Cat.java b/ebean-test/src/test/java/org/tests/model/basic/Cat.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Cat.java rename to ebean-test/src/test/java/org/tests/model/basic/Cat.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Contact.java b/ebean-test/src/test/java/org/tests/model/basic/Contact.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Contact.java rename to ebean-test/src/test/java/org/tests/model/basic/Contact.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ContactGroup.java b/ebean-test/src/test/java/org/tests/model/basic/ContactGroup.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ContactGroup.java rename to ebean-test/src/test/java/org/tests/model/basic/ContactGroup.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ContactNote.java b/ebean-test/src/test/java/org/tests/model/basic/ContactNote.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ContactNote.java rename to ebean-test/src/test/java/org/tests/model/basic/ContactNote.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Country.java b/ebean-test/src/test/java/org/tests/model/basic/Country.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Country.java rename to ebean-test/src/test/java/org/tests/model/basic/Country.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Customer.java b/ebean-test/src/test/java/org/tests/model/basic/Customer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Customer.java rename to ebean-test/src/test/java/org/tests/model/basic/Customer.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/CustomerAggregate.java b/ebean-test/src/test/java/org/tests/model/basic/CustomerAggregate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/CustomerAggregate.java rename to ebean-test/src/test/java/org/tests/model/basic/CustomerAggregate.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Dog.java b/ebean-test/src/test/java/org/tests/model/basic/Dog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Dog.java rename to ebean-test/src/test/java/org/tests/model/basic/Dog.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasic.java b/ebean-test/src/test/java/org/tests/model/basic/EBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasic.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasic.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicChangeLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicChangeLog.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicClob.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClob.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicClob.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicClob.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicClobNoVer.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicClobNoVer.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicEncrypt.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicEncrypt.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicEncryptClient.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicEncryptClient.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicEnumId.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicEnumId.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicEnumId.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicEnumInt.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumInt.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicEnumInt.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicEnumInt.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicLog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicLog.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicLog.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicVer.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicVer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicVer.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicVer.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicWithLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicWithLog.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java rename to ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ECustomId.java b/ebean-test/src/test/java/org/tests/model/basic/ECustomId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ECustomId.java rename to ebean-test/src/test/java/org/tests/model/basic/ECustomId.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EDefaultProp.java b/ebean-test/src/test/java/org/tests/model/basic/EDefaultProp.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EDefaultProp.java rename to ebean-test/src/test/java/org/tests/model/basic/EDefaultProp.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ENullCollection.java b/ebean-test/src/test/java/org/tests/model/basic/ENullCollection.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ENullCollection.java rename to ebean-test/src/test/java/org/tests/model/basic/ENullCollection.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ENullCollectionDetail.java b/ebean-test/src/test/java/org/tests/model/basic/ENullCollectionDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ENullCollectionDetail.java rename to ebean-test/src/test/java/org/tests/model/basic/ENullCollectionDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EOptOneA.java b/ebean-test/src/test/java/org/tests/model/basic/EOptOneA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EOptOneA.java rename to ebean-test/src/test/java/org/tests/model/basic/EOptOneA.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EOptOneB.java b/ebean-test/src/test/java/org/tests/model/basic/EOptOneB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EOptOneB.java rename to ebean-test/src/test/java/org/tests/model/basic/EOptOneB.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EOptOneC.java b/ebean-test/src/test/java/org/tests/model/basic/EOptOneC.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EOptOneC.java rename to ebean-test/src/test/java/org/tests/model/basic/EOptOneC.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ESimple.java b/ebean-test/src/test/java/org/tests/model/basic/ESimple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ESimple.java rename to ebean-test/src/test/java/org/tests/model/basic/ESimple.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ESomeType.java b/ebean-test/src/test/java/org/tests/model/basic/ESomeType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ESomeType.java rename to ebean-test/src/test/java/org/tests/model/basic/ESomeType.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ETransMany.java b/ebean-test/src/test/java/org/tests/model/basic/ETransMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ETransMany.java rename to ebean-test/src/test/java/org/tests/model/basic/ETransMany.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EVanillaCollection.java b/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollection.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EVanillaCollection.java rename to ebean-test/src/test/java/org/tests/model/basic/EVanillaCollection.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java b/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java rename to ebean-test/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/EWithInetAddr.java b/ebean-test/src/test/java/org/tests/model/basic/EWithInetAddr.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/EWithInetAddr.java rename to ebean-test/src/test/java/org/tests/model/basic/EWithInetAddr.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/FeatureDescription.java b/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/FeatureDescription.java rename to ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java rename to ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java rename to ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ListAttribute.java b/ebean-test/src/test/java/org/tests/model/basic/ListAttribute.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ListAttribute.java rename to ebean-test/src/test/java/org/tests/model/basic/ListAttribute.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ListAttributeValue.java b/ebean-test/src/test/java/org/tests/model/basic/ListAttributeValue.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ListAttributeValue.java rename to ebean-test/src/test/java/org/tests/model/basic/ListAttributeValue.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MNonEnum.java b/ebean-test/src/test/java/org/tests/model/basic/MNonEnum.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MNonEnum.java rename to ebean-test/src/test/java/org/tests/model/basic/MNonEnum.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java b/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java rename to ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MProtectedConstructBean.java b/ebean-test/src/test/java/org/tests/model/basic/MProtectedConstructBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MProtectedConstructBean.java rename to ebean-test/src/test/java/org/tests/model/basic/MProtectedConstructBean.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MRole.java b/ebean-test/src/test/java/org/tests/model/basic/MRole.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MRole.java rename to ebean-test/src/test/java/org/tests/model/basic/MRole.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MUser.java b/ebean-test/src/test/java/org/tests/model/basic/MUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MUser.java rename to ebean-test/src/test/java/org/tests/model/basic/MUser.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MUserType.java b/ebean-test/src/test/java/org/tests/model/basic/MUserType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MUserType.java rename to ebean-test/src/test/java/org/tests/model/basic/MUserType.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MnocRole.java b/ebean-test/src/test/java/org/tests/model/basic/MnocRole.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MnocRole.java rename to ebean-test/src/test/java/org/tests/model/basic/MnocRole.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MnocUser.java b/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MnocUser.java rename to ebean-test/src/test/java/org/tests/model/basic/MnocUser.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MyAdHoc.java b/ebean-test/src/test/java/org/tests/model/basic/MyAdHoc.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MyAdHoc.java rename to ebean-test/src/test/java/org/tests/model/basic/MyAdHoc.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java b/ebean-test/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java rename to ebean-test/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MyLobSize.java b/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MyLobSize.java rename to ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java b/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java rename to ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OBeanChild.java b/ebean-test/src/test/java/org/tests/model/basic/OBeanChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OBeanChild.java rename to ebean-test/src/test/java/org/tests/model/basic/OBeanChild.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OCachedBean.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OCachedBean.java rename to ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OCachedBeanChild.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedBeanChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OCachedBeanChild.java rename to ebean-test/src/test/java/org/tests/model/basic/OCachedBeanChild.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OCachedInhChildA.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OCachedInhChildA.java rename to ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildA.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OCachedInhChildB.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OCachedInhChildB.java rename to ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildB.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OCachedInhRoot.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OCachedInhRoot.java rename to ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OCar.java b/ebean-test/src/test/java/org/tests/model/basic/OCar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OCar.java rename to ebean-test/src/test/java/org/tests/model/basic/OCar.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OEngine.java b/ebean-test/src/test/java/org/tests/model/basic/OEngine.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OEngine.java rename to ebean-test/src/test/java/org/tests/model/basic/OEngine.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OGearBox.java b/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OGearBox.java rename to ebean-test/src/test/java/org/tests/model/basic/OGearBox.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Order.java b/ebean-test/src/test/java/org/tests/model/basic/Order.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Order.java rename to ebean-test/src/test/java/org/tests/model/basic/Order.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OrderAggregate.java b/ebean-test/src/test/java/org/tests/model/basic/OrderAggregate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OrderAggregate.java rename to ebean-test/src/test/java/org/tests/model/basic/OrderAggregate.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OrderDetail.java b/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OrderDetail.java rename to ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/OrderShipment.java b/ebean-test/src/test/java/org/tests/model/basic/OrderShipment.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/OrderShipment.java rename to ebean-test/src/test/java/org/tests/model/basic/OrderShipment.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/PFile.java b/ebean-test/src/test/java/org/tests/model/basic/PFile.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/PFile.java rename to ebean-test/src/test/java/org/tests/model/basic/PFile.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/PFileContent.java b/ebean-test/src/test/java/org/tests/model/basic/PFileContent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/PFileContent.java rename to ebean-test/src/test/java/org/tests/model/basic/PFileContent.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/PersistentFile.java b/ebean-test/src/test/java/org/tests/model/basic/PersistentFile.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/PersistentFile.java rename to ebean-test/src/test/java/org/tests/model/basic/PersistentFile.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/PersistentFileContent.java b/ebean-test/src/test/java/org/tests/model/basic/PersistentFileContent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/PersistentFileContent.java rename to ebean-test/src/test/java/org/tests/model/basic/PersistentFileContent.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Person.java b/ebean-test/src/test/java/org/tests/model/basic/Person.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Person.java rename to ebean-test/src/test/java/org/tests/model/basic/Person.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Phone.java b/ebean-test/src/test/java/org/tests/model/basic/Phone.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Phone.java rename to ebean-test/src/test/java/org/tests/model/basic/Phone.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Product.java b/ebean-test/src/test/java/org/tests/model/basic/Product.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Product.java rename to ebean-test/src/test/java/org/tests/model/basic/Product.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ResetBasicData.java b/ebean-test/src/test/java/org/tests/model/basic/ResetBasicData.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ResetBasicData.java rename to ebean-test/src/test/java/org/tests/model/basic/ResetBasicData.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Section.java b/ebean-test/src/test/java/org/tests/model/basic/Section.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Section.java rename to ebean-test/src/test/java/org/tests/model/basic/Section.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/SomeEnum.java b/ebean-test/src/test/java/org/tests/model/basic/SomeEnum.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/SomeEnum.java rename to ebean-test/src/test/java/org/tests/model/basic/SomeEnum.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/SomeEnumBean.java b/ebean-test/src/test/java/org/tests/model/basic/SomeEnumBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/SomeEnumBean.java rename to ebean-test/src/test/java/org/tests/model/basic/SomeEnumBean.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/SomeObject.java b/ebean-test/src/test/java/org/tests/model/basic/SomeObject.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/SomeObject.java rename to ebean-test/src/test/java/org/tests/model/basic/SomeObject.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/SubSection.java b/ebean-test/src/test/java/org/tests/model/basic/SubSection.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/SubSection.java rename to ebean-test/src/test/java/org/tests/model/basic/SubSection.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TBytesOnly.java b/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TBytesOnly.java rename to ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TIntChild.java b/ebean-test/src/test/java/org/tests/model/basic/TIntChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TIntChild.java rename to ebean-test/src/test/java/org/tests/model/basic/TIntChild.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TIntRoot.java b/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TIntRoot.java rename to ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TJodaEntity.java b/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TJodaEntity.java rename to ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TMapSuperEntity.java b/ebean-test/src/test/java/org/tests/model/basic/TMapSuperEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TMapSuperEntity.java rename to ebean-test/src/test/java/org/tests/model/basic/TMapSuperEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TMappedSuper2.java b/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TMappedSuper2.java rename to ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TOne.java b/ebean-test/src/test/java/org/tests/model/basic/TOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TOne.java rename to ebean-test/src/test/java/org/tests/model/basic/TOne.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TSDetail.java b/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TSDetail.java rename to ebean-test/src/test/java/org/tests/model/basic/TSDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TSMaster.java b/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TSMaster.java rename to ebean-test/src/test/java/org/tests/model/basic/TSMaster.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TUuidEntity.java b/ebean-test/src/test/java/org/tests/model/basic/TUuidEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TUuidEntity.java rename to ebean-test/src/test/java/org/tests/model/basic/TUuidEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TWithPreInsert.java b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TWithPreInsert.java rename to ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Trip.java b/ebean-test/src/test/java/org/tests/model/basic/Trip.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Trip.java rename to ebean-test/src/test/java/org/tests/model/basic/Trip.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Truck.java b/ebean-test/src/test/java/org/tests/model/basic/Truck.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Truck.java rename to ebean-test/src/test/java/org/tests/model/basic/Truck.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/TruckRef.java b/ebean-test/src/test/java/org/tests/model/basic/TruckRef.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/TruckRef.java rename to ebean-test/src/test/java/org/tests/model/basic/TruckRef.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/UTDetail.java b/ebean-test/src/test/java/org/tests/model/basic/UTDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/UTDetail.java rename to ebean-test/src/test/java/org/tests/model/basic/UTDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/UTMaster.java b/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/UTMaster.java rename to ebean-test/src/test/java/org/tests/model/basic/UTMaster.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/UUOne.java b/ebean-test/src/test/java/org/tests/model/basic/UUOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/UUOne.java rename to ebean-test/src/test/java/org/tests/model/basic/UUOne.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/UUTwo.java b/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/UUTwo.java rename to ebean-test/src/test/java/org/tests/model/basic/UUTwo.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/ValidationGroupSomething.java b/ebean-test/src/test/java/org/tests/model/basic/ValidationGroupSomething.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/ValidationGroupSomething.java rename to ebean-test/src/test/java/org/tests/model/basic/ValidationGroupSomething.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Vehicle.java b/ebean-test/src/test/java/org/tests/model/basic/Vehicle.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/Vehicle.java rename to ebean-test/src/test/java/org/tests/model/basic/Vehicle.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleDriver.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleDriver.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/VehicleDriver.java rename to ebean-test/src/test/java/org/tests/model/basic/VehicleDriver.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleLease.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleLease.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/VehicleLease.java rename to ebean-test/src/test/java/org/tests/model/basic/VehicleLease.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseLong.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseLong.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseLong.java rename to ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseLong.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseShort.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseShort.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseShort.java rename to ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseShort.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/VwCustomer.java b/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/VwCustomer.java rename to ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/CInhOne.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/CInhOne.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/CInhOne.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/CInhRef.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/CInhRef.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/CInhRoot.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRoot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/CInhRoot.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/CInhRoot.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/CInhTwo.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhTwo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/CInhTwo.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/CInhTwo.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/ECacheChild.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/ECacheChild.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/ECacheRoot.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/ECacheRoot.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/OCacheBase.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCacheBase.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/OCacheBase.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/OCacheBase.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/OCachedApp.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedApp.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/OCachedApp.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/OCachedApp.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java rename to ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/event/CustomerPersistAdapter.java b/ebean-test/src/test/java/org/tests/model/basic/event/CustomerPersistAdapter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/event/CustomerPersistAdapter.java rename to ebean-test/src/test/java/org/tests/model/basic/event/CustomerPersistAdapter.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java b/ebean-test/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java rename to ebean-test/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java b/ebean-test/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java rename to ebean-test/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/finder/CustomerFinder.java b/ebean-test/src/test/java/org/tests/model/basic/finder/CustomerFinder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/finder/CustomerFinder.java rename to ebean-test/src/test/java/org/tests/model/basic/finder/CustomerFinder.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/first/First.java b/ebean-test/src/test/java/org/tests/model/basic/first/First.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/first/First.java rename to ebean-test/src/test/java/org/tests/model/basic/first/First.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/first/Second.java b/ebean-test/src/test/java/org/tests/model/basic/first/Second.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/first/Second.java rename to ebean-test/src/test/java/org/tests/model/basic/first/Second.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/first/SuperSecond.java b/ebean-test/src/test/java/org/tests/model/basic/first/SuperSecond.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/first/SuperSecond.java rename to ebean-test/src/test/java/org/tests/model/basic/first/SuperSecond.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/first/TestFirstSecond.java b/ebean-test/src/test/java/org/tests/model/basic/first/TestFirstSecond.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/first/TestFirstSecond.java rename to ebean-test/src/test/java/org/tests/model/basic/first/TestFirstSecond.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java rename to ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java rename to ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java rename to ebean-test/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java b/ebean-test/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java rename to ebean-test/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/DummyDao.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/DummyDao.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/DummyDao.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/DummyDao.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/EdChild.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/EdChild.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/EdParent.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/EdParent.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java rename to ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BAccessLevel.java b/ebean-test/src/test/java/org/tests/model/bridge/BAccessLevel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BAccessLevel.java rename to ebean-test/src/test/java/org/tests/model/bridge/BAccessLevel.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BDManyId.java b/ebean-test/src/test/java/org/tests/model/bridge/BDManyId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BDManyId.java rename to ebean-test/src/test/java/org/tests/model/bridge/BDManyId.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BEmbId.java b/ebean-test/src/test/java/org/tests/model/bridge/BEmbId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BEmbId.java rename to ebean-test/src/test/java/org/tests/model/bridge/BEmbId.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSite.java b/ebean-test/src/test/java/org/tests/model/bridge/BSite.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BSite.java rename to ebean-test/src/test/java/org/tests/model/bridge/BSite.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserA.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BSiteUserA.java rename to ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserB.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BSiteUserB.java rename to ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserC.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BSiteUserC.java rename to ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserD.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserD.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BSiteUserD.java rename to ebean-test/src/test/java/org/tests/model/bridge/BSiteUserD.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserDMany.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BSiteUserDMany.java rename to ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSiteUserE.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserE.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BSiteUserE.java rename to ebean-test/src/test/java/org/tests/model/bridge/BSiteUserE.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BUser.java b/ebean-test/src/test/java/org/tests/model/bridge/BUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/BUser.java rename to ebean-test/src/test/java/org/tests/model/bridge/BUser.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java b/ebean-test/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java rename to ebean-test/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java diff --git a/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java b/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java rename to ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java diff --git a/ebean-core/src/test/java/org/tests/model/cache/EColAB.java b/ebean-test/src/test/java/org/tests/model/cache/EColAB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/cache/EColAB.java rename to ebean-test/src/test/java/org/tests/model/cache/EColAB.java diff --git a/ebean-core/src/test/java/org/tests/model/cache/M2MCacheChild.java b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/cache/M2MCacheChild.java rename to ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java diff --git a/ebean-core/src/test/java/org/tests/model/cache/M2MCacheMaster.java b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/cache/M2MCacheMaster.java rename to ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheel/Car.java b/ebean-test/src/test/java/org/tests/model/carwheel/Car.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheel/Car.java rename to ebean-test/src/test/java/org/tests/model/carwheel/Car.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheel/Tire.java b/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheel/Tire.java rename to ebean-test/src/test/java/org/tests/model/carwheel/Tire.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheel/Wheel.java b/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheel/Wheel.java rename to ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TCar.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheeltruck/TCar.java rename to ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TTruck.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheeltruck/TTruck.java rename to ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java rename to ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java rename to ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TWheel.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TWheel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheeltruck/TWheel.java rename to ebean-test/src/test/java/org/tests/model/carwheeltruck/TWheel.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java rename to ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java rename to ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java rename to ebean-test/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/CkeClient.java b/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/CkeClient.java rename to ebean-test/src/test/java/org/tests/model/composite/CkeClient.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/CkeClientKey.java b/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/CkeClientKey.java rename to ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/CkeUser.java b/ebean-test/src/test/java/org/tests/model/composite/CkeUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/CkeUser.java rename to ebean-test/src/test/java/org/tests/model/composite/CkeUser.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/CkeUserKey.java b/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/CkeUserKey.java rename to ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/RCustomer.java b/ebean-test/src/test/java/org/tests/model/composite/RCustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/RCustomer.java rename to ebean-test/src/test/java/org/tests/model/composite/RCustomer.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/RCustomerKey.java b/ebean-test/src/test/java/org/tests/model/composite/RCustomerKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/RCustomerKey.java rename to ebean-test/src/test/java/org/tests/model/composite/RCustomerKey.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/ROrder.java b/ebean-test/src/test/java/org/tests/model/composite/ROrder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/ROrder.java rename to ebean-test/src/test/java/org/tests/model/composite/ROrder.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/ROrderPK.java b/ebean-test/src/test/java/org/tests/model/composite/ROrderPK.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/ROrderPK.java rename to ebean-test/src/test/java/org/tests/model/composite/ROrderPK.java diff --git a/ebean-core/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java b/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java rename to ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java diff --git a/ebean-core/src/test/java/org/tests/model/converstation/Conversation.java b/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/converstation/Conversation.java rename to ebean-test/src/test/java/org/tests/model/converstation/Conversation.java diff --git a/ebean-core/src/test/java/org/tests/model/converstation/Group.java b/ebean-test/src/test/java/org/tests/model/converstation/Group.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/converstation/Group.java rename to ebean-test/src/test/java/org/tests/model/converstation/Group.java diff --git a/ebean-core/src/test/java/org/tests/model/converstation/Message.java b/ebean-test/src/test/java/org/tests/model/converstation/Message.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/converstation/Message.java rename to ebean-test/src/test/java/org/tests/model/converstation/Message.java diff --git a/ebean-core/src/test/java/org/tests/model/converstation/Participation.java b/ebean-test/src/test/java/org/tests/model/converstation/Participation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/converstation/Participation.java rename to ebean-test/src/test/java/org/tests/model/converstation/Participation.java diff --git a/ebean-core/src/test/java/org/tests/model/converstation/User.java b/ebean-test/src/test/java/org/tests/model/converstation/User.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/converstation/User.java rename to ebean-test/src/test/java/org/tests/model/converstation/User.java diff --git a/ebean-core/src/test/java/org/tests/model/ddd/DExhEntity.java b/ebean-test/src/test/java/org/tests/model/ddd/DExhEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ddd/DExhEntity.java rename to ebean-test/src/test/java/org/tests/model/ddd/DExhEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/ddd/DPerson.java b/ebean-test/src/test/java/org/tests/model/ddd/DPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ddd/DPerson.java rename to ebean-test/src/test/java/org/tests/model/ddd/DPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java b/ebean-test/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java rename to ebean-test/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java diff --git a/ebean-core/src/test/java/org/tests/model/docstore/CustomerReport.java b/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/docstore/CustomerReport.java rename to ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java diff --git a/ebean-core/src/test/java/org/tests/model/docstore/ProductReport.java b/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/docstore/ProductReport.java rename to ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java diff --git a/ebean-core/src/test/java/org/tests/model/docstore/Report.java b/ebean-test/src/test/java/org/tests/model/docstore/Report.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/docstore/Report.java rename to ebean-test/src/test/java/org/tests/model/docstore/Report.java diff --git a/ebean-core/src/test/java/org/tests/model/draftable/BaseDomain.java b/ebean-test/src/test/java/org/tests/model/draftable/BaseDomain.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/draftable/BaseDomain.java rename to ebean-test/src/test/java/org/tests/model/draftable/BaseDomain.java diff --git a/ebean-core/src/test/java/org/tests/model/draftable/BasicDraftableBean.java b/ebean-test/src/test/java/org/tests/model/draftable/BasicDraftableBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/draftable/BasicDraftableBean.java rename to ebean-test/src/test/java/org/tests/model/draftable/BasicDraftableBean.java diff --git a/ebean-core/src/test/java/org/tests/model/draftable/Doc.java b/ebean-test/src/test/java/org/tests/model/draftable/Doc.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/draftable/Doc.java rename to ebean-test/src/test/java/org/tests/model/draftable/Doc.java diff --git a/ebean-core/src/test/java/org/tests/model/draftable/Document.java b/ebean-test/src/test/java/org/tests/model/draftable/Document.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/draftable/Document.java rename to ebean-test/src/test/java/org/tests/model/draftable/Document.java diff --git a/ebean-core/src/test/java/org/tests/model/draftable/DocumentMedia.java b/ebean-test/src/test/java/org/tests/model/draftable/DocumentMedia.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/draftable/DocumentMedia.java rename to ebean-test/src/test/java/org/tests/model/draftable/DocumentMedia.java diff --git a/ebean-core/src/test/java/org/tests/model/draftable/Link.java b/ebean-test/src/test/java/org/tests/model/draftable/Link.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/draftable/Link.java rename to ebean-test/src/test/java/org/tests/model/draftable/Link.java diff --git a/ebean-core/src/test/java/org/tests/model/draftable/Organisation.java b/ebean-test/src/test/java/org/tests/model/draftable/Organisation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/draftable/Organisation.java rename to ebean-test/src/test/java/org/tests/model/draftable/Organisation.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcPerson.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcPersonPersistAdapter.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPersonPersistAdapter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcPersonPersistAdapter.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcPersonPersistAdapter.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcPhone.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPhone.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcPhone.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcPhone.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcTop.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcTop.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcblPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcblPerson.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcbmPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcbmPerson.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcmPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcmPerson.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcmcPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcmcPerson.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcsPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcsPerson.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcsmChild.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcsmChild.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcsmOne.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcsmOne.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcsmParent.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcsmParent.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcsmParent.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcsmTwo.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/EcsmTwo.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java rename to ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EAddr.java b/ebean-test/src/test/java/org/tests/model/embedded/EAddr.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EAddr.java rename to ebean-test/src/test/java/org/tests/model/embedded/EAddr.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java b/ebean-test/src/test/java/org/tests/model/embedded/EAddress.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EAddress.java rename to ebean-test/src/test/java/org/tests/model/embedded/EAddress.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EAddressStatus.java b/ebean-test/src/test/java/org/tests/model/embedded/EAddressStatus.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EAddressStatus.java rename to ebean-test/src/test/java/org/tests/model/embedded/EAddressStatus.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java rename to ebean-test/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EEmbInner.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EEmbInner.java rename to ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EEmbOuter.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EEmbOuter.java rename to ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EInvoice.java b/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EInvoice.java rename to ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EMain.java b/ebean-test/src/test/java/org/tests/model/embedded/EMain.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EMain.java rename to ebean-test/src/test/java/org/tests/model/embedded/EMain.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EPerAddr.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerAddr.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EPerAddr.java rename to ebean-test/src/test/java/org/tests/model/embedded/EPerAddr.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EPerson.java rename to ebean-test/src/test/java/org/tests/model/embedded/EPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EPerson2.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EPerson2.java rename to ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EPerson3.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/EPerson3.java rename to ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java b/ebean-test/src/test/java/org/tests/model/embedded/Eembeddable.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java rename to ebean-test/src/test/java/org/tests/model/embedded/Eembeddable.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/PrimaryRevision.java b/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/PrimaryRevision.java rename to ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/RevisionId.java b/ebean-test/src/test/java/org/tests/model/embedded/RevisionId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/RevisionId.java rename to ebean-test/src/test/java/org/tests/model/embedded/RevisionId.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java rename to ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java rename to ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java rename to ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java rename to ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLive.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java rename to ebean-test/src/test/java/org/tests/model/embedded/UserInterestLive.java diff --git a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java rename to ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java diff --git a/ebean-core/src/test/java/org/tests/model/family/ChildPerson.java b/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/family/ChildPerson.java rename to ebean-test/src/test/java/org/tests/model/family/ChildPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/family/GrandParentPerson.java b/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/family/GrandParentPerson.java rename to ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/family/InheritablePerson.java b/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/family/InheritablePerson.java rename to ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java diff --git a/ebean-core/src/test/java/org/tests/model/family/ParentPerson.java b/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/family/ParentPerson.java rename to ebean-test/src/test/java/org/tests/model/family/ParentPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/generated/User.java b/ebean-test/src/test/java/org/tests/model/generated/User.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/generated/User.java rename to ebean-test/src/test/java/org/tests/model/generated/User.java diff --git a/ebean-core/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java b/ebean-test/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java rename to ebean-test/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HEmbiBean.java b/ebean-test/src/test/java/org/tests/model/history/HEmbiBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HEmbiBean.java rename to ebean-test/src/test/java/org/tests/model/history/HEmbiBean.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HEmbiId.java b/ebean-test/src/test/java/org/tests/model/history/HEmbiId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HEmbiId.java rename to ebean-test/src/test/java/org/tests/model/history/HEmbiId.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HeDoc.java b/ebean-test/src/test/java/org/tests/model/history/HeDoc.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HeDoc.java rename to ebean-test/src/test/java/org/tests/model/history/HeDoc.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HeLink.java b/ebean-test/src/test/java/org/tests/model/history/HeLink.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HeLink.java rename to ebean-test/src/test/java/org/tests/model/history/HeLink.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HiDoc.java b/ebean-test/src/test/java/org/tests/model/history/HiDoc.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HiDoc.java rename to ebean-test/src/test/java/org/tests/model/history/HiDoc.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HiLink.java b/ebean-test/src/test/java/org/tests/model/history/HiLink.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HiLink.java rename to ebean-test/src/test/java/org/tests/model/history/HiLink.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HiTOne.java b/ebean-test/src/test/java/org/tests/model/history/HiTOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HiTOne.java rename to ebean-test/src/test/java/org/tests/model/history/HiTOne.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HiTThree.java b/ebean-test/src/test/java/org/tests/model/history/HiTThree.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HiTThree.java rename to ebean-test/src/test/java/org/tests/model/history/HiTThree.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HiTTwo.java b/ebean-test/src/test/java/org/tests/model/history/HiTTwo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HiTTwo.java rename to ebean-test/src/test/java/org/tests/model/history/HiTTwo.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HsdSetting.java b/ebean-test/src/test/java/org/tests/model/history/HsdSetting.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HsdSetting.java rename to ebean-test/src/test/java/org/tests/model/history/HsdSetting.java diff --git a/ebean-core/src/test/java/org/tests/model/history/HsdUser.java b/ebean-test/src/test/java/org/tests/model/history/HsdUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/HsdUser.java rename to ebean-test/src/test/java/org/tests/model/history/HsdUser.java diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java rename to ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryExclude.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryExclude.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/TestHistoryExclude.java rename to ebean-test/src/test/java/org/tests/model/history/TestHistoryExclude.java diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryInclude.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryInclude.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/TestHistoryInclude.java rename to ebean-test/src/test/java/org/tests/model/history/TestHistoryInclude.java diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryOneToMany.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/TestHistoryOneToMany.java rename to ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java rename to ebean-test/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java diff --git a/ebean-core/src/test/java/org/tests/model/info/InfoCompany.java b/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/info/InfoCompany.java rename to ebean-test/src/test/java/org/tests/model/info/InfoCompany.java diff --git a/ebean-core/src/test/java/org/tests/model/info/InfoContact.java b/ebean-test/src/test/java/org/tests/model/info/InfoContact.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/info/InfoContact.java rename to ebean-test/src/test/java/org/tests/model/info/InfoContact.java diff --git a/ebean-core/src/test/java/org/tests/model/info/InfoCustomer.java b/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/info/InfoCustomer.java rename to ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java rename to ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritexposedtype/IXResource.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritexposedtype/IXResource.java rename to ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java rename to ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/IMRelated.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRelated.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/IMRelated.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/IMRelated.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/IMRoot.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/IMRoot.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/IMRootOne.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/IMRootOne.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/IMRootOne.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/IMRootTwo.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootTwo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/IMRootTwo.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/IMRootTwo.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/MBase.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MBase.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/MBase.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/MBase.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/MMedia.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/MMedia.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/MPicture.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MPicture.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/MPicture.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/MPicture.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/MProfile.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MProfile.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/MProfile.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/MProfile.java diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java b/ebean-test/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java rename to ebean-test/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/Address.java b/ebean-test/src/test/java/org/tests/model/interfaces/Address.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/Address.java rename to ebean-test/src/test/java/org/tests/model/interfaces/Address.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/IAddress.java b/ebean-test/src/test/java/org/tests/model/interfaces/IAddress.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/IAddress.java rename to ebean-test/src/test/java/org/tests/model/interfaces/IAddress.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/IPerson.java b/ebean-test/src/test/java/org/tests/model/interfaces/IPerson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/IPerson.java rename to ebean-test/src/test/java/org/tests/model/interfaces/IPerson.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/IPersona.java b/ebean-test/src/test/java/org/tests/model/interfaces/IPersona.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/IPersona.java rename to ebean-test/src/test/java/org/tests/model/interfaces/IPersona.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/Person.java b/ebean-test/src/test/java/org/tests/model/interfaces/Person.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/Person.java rename to ebean-test/src/test/java/org/tests/model/interfaces/Person.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/Persona.java b/ebean-test/src/test/java/org/tests/model/interfaces/Persona.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/Persona.java rename to ebean-test/src/test/java/org/tests/model/interfaces/Persona.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/SelfManyMany.java b/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/SelfManyMany.java rename to ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/TestSelfMany.java b/ebean-test/src/test/java/org/tests/model/interfaces/TestSelfMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/TestSelfMany.java rename to ebean-test/src/test/java/org/tests/model/interfaces/TestSelfMany.java diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/TestTargetEntity.java b/ebean-test/src/test/java/org/tests/model/interfaces/TestTargetEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/interfaces/TestTargetEntity.java rename to ebean-test/src/test/java/org/tests/model/interfaces/TestTargetEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/ESomeConvertType.java b/ebean-test/src/test/java/org/tests/model/ivo/ESomeConvertType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/ESomeConvertType.java rename to ebean-test/src/test/java/org/tests/model/ivo/ESomeConvertType.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/Money.java b/ebean-test/src/test/java/org/tests/model/ivo/Money.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/Money.java rename to ebean-test/src/test/java/org/tests/model/ivo/Money.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/Oid.java b/ebean-test/src/test/java/org/tests/model/ivo/Oid.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/Oid.java rename to ebean-test/src/test/java/org/tests/model/ivo/Oid.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/Segment.java b/ebean-test/src/test/java/org/tests/model/ivo/Segment.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/Segment.java rename to ebean-test/src/test/java/org/tests/model/ivo/Segment.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/SysTime.java b/ebean-test/src/test/java/org/tests/model/ivo/SysTime.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/SysTime.java rename to ebean-test/src/test/java/org/tests/model/ivo/SysTime.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/AnEnumType.java b/ebean-test/src/test/java/org/tests/model/ivo/converter/AnEnumType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/converter/AnEnumType.java rename to ebean-test/src/test/java/org/tests/model/ivo/converter/AnEnumType.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/AnEnumTypeConvert.java b/ebean-test/src/test/java/org/tests/model/ivo/converter/AnEnumTypeConvert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/converter/AnEnumTypeConvert.java rename to ebean-test/src/test/java/org/tests/model/ivo/converter/AnEnumTypeConvert.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java b/ebean-test/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java rename to ebean-test/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java b/ebean-test/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java rename to ebean-test/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java b/ebean-test/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java rename to ebean-test/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java diff --git a/ebean-core/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java b/ebean-test/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java rename to ebean-test/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java diff --git a/ebean-core/src/test/java/org/tests/model/joda/BasicJodaEntity.java b/ebean-test/src/test/java/org/tests/model/joda/BasicJodaEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/joda/BasicJodaEntity.java rename to ebean-test/src/test/java/org/tests/model/joda/BasicJodaEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java b/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java rename to ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java diff --git a/ebean-core/src/test/java/org/tests/model/json/BasicJacksonType.java b/ebean-test/src/test/java/org/tests/model/json/BasicJacksonType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/BasicJacksonType.java rename to ebean-test/src/test/java/org/tests/model/json/BasicJacksonType.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicHstore.java b/ebean-test/src/test/java/org/tests/model/json/EBasicHstore.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicHstore.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicHstore.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson2.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson2.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson3.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonJackson3.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonList.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonList.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMap.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonMap.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapClob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapClob.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapClob.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapClob.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonMulti.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonMulti.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonNode.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonNode.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicOldValue.java b/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicOldValue.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java b/ebean-test/src/test/java/org/tests/model/json/EBasicPlain.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java rename to ebean-test/src/test/java/org/tests/model/json/EBasicPlain.java diff --git a/ebean-core/src/test/java/org/tests/model/json/LongJacksonType.java b/ebean-test/src/test/java/org/tests/model/json/LongJacksonType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/LongJacksonType.java rename to ebean-test/src/test/java/org/tests/model/json/LongJacksonType.java diff --git a/ebean-core/src/test/java/org/tests/model/json/PlainBean.java b/ebean-test/src/test/java/org/tests/model/json/PlainBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/PlainBean.java rename to ebean-test/src/test/java/org/tests/model/json/PlainBean.java diff --git a/ebean-core/src/test/java/org/tests/model/json/PlainBeanDirtyAware.java b/ebean-test/src/test/java/org/tests/model/json/PlainBeanDirtyAware.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/PlainBeanDirtyAware.java rename to ebean-test/src/test/java/org/tests/model/json/PlainBeanDirtyAware.java diff --git a/ebean-core/src/test/java/org/tests/model/json/StringJacksonType.java b/ebean-test/src/test/java/org/tests/model/json/StringJacksonType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/StringJacksonType.java rename to ebean-test/src/test/java/org/tests/model/json/StringJacksonType.java diff --git a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java b/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java rename to ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java diff --git a/ebean-core/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java rename to ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java diff --git a/ebean-core/src/test/java/org/tests/model/lazywithcache/ParentA.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/lazywithcache/ParentA.java rename to ebean-test/src/test/java/org/tests/model/lazywithcache/ParentA.java diff --git a/ebean-core/src/test/java/org/tests/model/lazywithcache/ParentB.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/lazywithcache/ParentB.java rename to ebean-test/src/test/java/org/tests/model/lazywithcache/ParentB.java diff --git a/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java rename to ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/model/lazywithid/Looney.java b/ebean-test/src/test/java/org/tests/model/lazywithid/Looney.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/lazywithid/Looney.java rename to ebean-test/src/test/java/org/tests/model/lazywithid/Looney.java diff --git a/ebean-core/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java b/ebean-test/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java rename to ebean-test/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java diff --git a/ebean-core/src/test/java/org/tests/model/lazywithid/Tune.java b/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/lazywithid/Tune.java rename to ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/DCredit.java b/ebean-test/src/test/java/org/tests/model/m2m/DCredit.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/DCredit.java rename to ebean-test/src/test/java/org/tests/model/m2m/DCredit.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/DRol.java b/ebean-test/src/test/java/org/tests/model/m2m/DRol.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/DRol.java rename to ebean-test/src/test/java/org/tests/model/m2m/DRol.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/DRot.java b/ebean-test/src/test/java/org/tests/model/m2m/DRot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/DRot.java rename to ebean-test/src/test/java/org/tests/model/m2m/DRot.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MailBox.java b/ebean-test/src/test/java/org/tests/model/m2m/MailBox.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/MailBox.java rename to ebean-test/src/test/java/org/tests/model/m2m/MailBox.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MailUser.java b/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/MailUser.java rename to ebean-test/src/test/java/org/tests/model/m2m/MailUser.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MnyA.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/MnyA.java rename to ebean-test/src/test/java/org/tests/model/m2m/MnyA.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MnyB.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/MnyB.java rename to ebean-test/src/test/java/org/tests/model/m2m/MnyB.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MnyC.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyC.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/MnyC.java rename to ebean-test/src/test/java/org/tests/model/m2m/MnyC.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MnyEdge.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/MnyEdge.java rename to ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MnyNode.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/MnyNode.java rename to ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/MnyTopic.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/MnyTopic.java rename to ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/Permission.java b/ebean-test/src/test/java/org/tests/model/m2m/Permission.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/Permission.java rename to ebean-test/src/test/java/org/tests/model/m2m/Permission.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/Role.java b/ebean-test/src/test/java/org/tests/model/m2m/Role.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/Role.java rename to ebean-test/src/test/java/org/tests/model/m2m/Role.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/Tenant.java b/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/Tenant.java rename to ebean-test/src/test/java/org/tests/model/m2m/Tenant.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java rename to ebean-test/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java diff --git a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java rename to ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java diff --git a/ebean-core/src/test/java/org/tests/model/m2o/Addr.java b/ebean-test/src/test/java/org/tests/model/m2o/Addr.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2o/Addr.java rename to ebean-test/src/test/java/org/tests/model/m2o/Addr.java diff --git a/ebean-core/src/test/java/org/tests/model/m2o/Empl.java b/ebean-test/src/test/java/org/tests/model/m2o/Empl.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2o/Empl.java rename to ebean-test/src/test/java/org/tests/model/m2o/Empl.java diff --git a/ebean-core/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java b/ebean-test/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java rename to ebean-test/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java diff --git a/ebean-core/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java b/ebean-test/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java rename to ebean-test/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java diff --git a/ebean-core/src/test/java/org/tests/model/map/MpRole.java b/ebean-test/src/test/java/org/tests/model/map/MpRole.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/map/MpRole.java rename to ebean-test/src/test/java/org/tests/model/map/MpRole.java diff --git a/ebean-core/src/test/java/org/tests/model/map/MpUser.java b/ebean-test/src/test/java/org/tests/model/map/MpUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/map/MpUser.java rename to ebean-test/src/test/java/org/tests/model/map/MpUser.java diff --git a/ebean-core/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java b/ebean-test/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java rename to ebean-test/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java diff --git a/ebean-core/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java b/ebean-test/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java rename to ebean-test/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java diff --git a/ebean-core/src/test/java/org/tests/model/nofk/EFile2NoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/EFile2NoFk.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/nofk/EFile2NoFk.java rename to ebean-test/src/test/java/org/tests/model/nofk/EFile2NoFk.java diff --git a/ebean-core/src/test/java/org/tests/model/nofk/EFileNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/EFileNoFk.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/nofk/EFileNoFk.java rename to ebean-test/src/test/java/org/tests/model/nofk/EFileNoFk.java diff --git a/ebean-core/src/test/java/org/tests/model/nofk/EUserNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFk.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/nofk/EUserNoFk.java rename to ebean-test/src/test/java/org/tests/model/nofk/EUserNoFk.java diff --git a/ebean-core/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java b/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java rename to ebean-test/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java diff --git a/ebean-core/src/test/java/org/tests/model/nofk/Test2NoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/nofk/Test2NoFk.java rename to ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java diff --git a/ebean-core/src/test/java/org/tests/model/nofk/TestNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/nofk/TestNoFk.java rename to ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java diff --git a/ebean-core/src/test/java/org/tests/model/nofk/TestTruncate.java b/ebean-test/src/test/java/org/tests/model/nofk/TestTruncate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/nofk/TestTruncate.java rename to ebean-test/src/test/java/org/tests/model/nofk/TestTruncate.java diff --git a/ebean-core/src/test/java/org/tests/model/noid/NoIdBean.java b/ebean-test/src/test/java/org/tests/model/noid/NoIdBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/noid/NoIdBean.java rename to ebean-test/src/test/java/org/tests/model/noid/NoIdBean.java diff --git a/ebean-core/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java b/ebean-test/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java rename to ebean-test/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/Account.java b/ebean-test/src/test/java/org/tests/model/onetoone/Account.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/Account.java rename to ebean-test/src/test/java/org/tests/model/onetoone/Account.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OCompany.java b/ebean-test/src/test/java/org/tests/model/onetoone/OCompany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OCompany.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OCompany.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java b/ebean-test/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java rename to ebean-test/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoAone.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoAone.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoAone.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoAone.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoAtwo.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoAtwo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoAtwo.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoAtwo.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoBChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoBChild.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoBMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoBMaster.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoChild.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoChild.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoCust.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoCust.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoCustAddress.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCustAddress.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoCustAddress.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoCustAddress.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoMaster.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoMaster.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoPrime.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoSdChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoSdChild.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoSdChild.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoSdMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoSdMaster.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoThMany.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoThMany.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoThMany.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoThOne.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoThOne.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoThOne.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoThTop.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThTop.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoThTop.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoThTop.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoUBPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoUBPrime.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoUPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoUPrime.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoUser.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoUser.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/OtoUserOptional.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/OtoUserOptional.java rename to ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java rename to ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/User.java b/ebean-test/src/test/java/org/tests/model/onetoone/User.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/User.java rename to ebean-test/src/test/java/org/tests/model/onetoone/User.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/album/Album.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/Album.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/album/Album.java rename to ebean-test/src/test/java/org/tests/model/onetoone/album/Album.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/album/BaseModel.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/BaseModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/album/BaseModel.java rename to ebean-test/src/test/java/org/tests/model/onetoone/album/BaseModel.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/album/Cover.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/Cover.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/album/Cover.java rename to ebean-test/src/test/java/org/tests/model/onetoone/album/Cover.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java rename to ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java rename to ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java rename to ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java rename to ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java rename to ebean-test/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java diff --git a/ebean-core/src/test/java/org/tests/model/orderentity/OrderEntity.java b/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orderentity/OrderEntity.java rename to ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/orderentity/OrderItemEntity.java b/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orderentity/OrderItemEntity.java rename to ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/OrpDetail.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/OrpDetail.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/OrpMaster.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/OrpMaster.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java rename to ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java diff --git a/ebean-core/src/test/java/org/tests/model/prnt/MPrinter.java b/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/prnt/MPrinter.java rename to ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java diff --git a/ebean-core/src/test/java/org/tests/model/prnt/MPrinterListener.java b/ebean-test/src/test/java/org/tests/model/prnt/MPrinterListener.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/prnt/MPrinterListener.java rename to ebean-test/src/test/java/org/tests/model/prnt/MPrinterListener.java diff --git a/ebean-core/src/test/java/org/tests/model/prnt/MPrinterState.java b/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/prnt/MPrinterState.java rename to ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java diff --git a/ebean-core/src/test/java/org/tests/model/prnt/MSomeOther.java b/ebean-test/src/test/java/org/tests/model/prnt/MSomeOther.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/prnt/MSomeOther.java rename to ebean-test/src/test/java/org/tests/model/prnt/MSomeOther.java diff --git a/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java b/ebean-test/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java rename to ebean-test/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java diff --git a/ebean-core/src/test/java/org/tests/model/pview/Paggview.java b/ebean-test/src/test/java/org/tests/model/pview/Paggview.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/pview/Paggview.java rename to ebean-test/src/test/java/org/tests/model/pview/Paggview.java diff --git a/ebean-core/src/test/java/org/tests/model/pview/Pview.java b/ebean-test/src/test/java/org/tests/model/pview/Pview.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/pview/Pview.java rename to ebean-test/src/test/java/org/tests/model/pview/Pview.java diff --git a/ebean-core/src/test/java/org/tests/model/pview/TestPview.java b/ebean-test/src/test/java/org/tests/model/pview/TestPview.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/pview/TestPview.java rename to ebean-test/src/test/java/org/tests/model/pview/TestPview.java diff --git a/ebean-core/src/test/java/org/tests/model/pview/Wview.java b/ebean-test/src/test/java/org/tests/model/pview/Wview.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/pview/Wview.java rename to ebean-test/src/test/java/org/tests/model/pview/Wview.java diff --git a/ebean-core/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java b/ebean-test/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java rename to ebean-test/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java diff --git a/ebean-core/src/test/java/org/tests/model/selfref/BaseResourceFile.java b/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/selfref/BaseResourceFile.java rename to ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java diff --git a/ebean-core/src/test/java/org/tests/model/selfref/ResourceFile.java b/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/selfref/ResourceFile.java rename to ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java diff --git a/ebean-core/src/test/java/org/tests/model/selfref/SelfParent.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/selfref/SelfParent.java rename to ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java diff --git a/ebean-core/src/test/java/org/tests/model/selfref/SelfRefCustomer.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/selfref/SelfRefCustomer.java rename to ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java diff --git a/ebean-core/src/test/java/org/tests/model/selfref/SelfRefExample.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/selfref/SelfRefExample.java rename to ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java diff --git a/ebean-core/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java b/ebean-test/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java rename to ebean-test/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java diff --git a/ebean-core/src/test/java/org/tests/model/selfref/TestSelfRefExample.java b/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/selfref/TestSelfRefExample.java rename to ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java diff --git a/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java b/ebean-test/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java rename to ebean-test/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java diff --git a/ebean-core/src/test/java/org/tests/model/site/DataContainer.java b/ebean-test/src/test/java/org/tests/model/site/DataContainer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/site/DataContainer.java rename to ebean-test/src/test/java/org/tests/model/site/DataContainer.java diff --git a/ebean-core/src/test/java/org/tests/model/site/Site.java b/ebean-test/src/test/java/org/tests/model/site/Site.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/site/Site.java rename to ebean-test/src/test/java/org/tests/model/site/Site.java diff --git a/ebean-core/src/test/java/org/tests/model/site/SiteAddress.java b/ebean-test/src/test/java/org/tests/model/site/SiteAddress.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/site/SiteAddress.java rename to ebean-test/src/test/java/org/tests/model/site/SiteAddress.java diff --git a/ebean-core/src/test/java/org/tests/model/site/TestTreeModel.java b/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/site/TestTreeModel.java rename to ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java diff --git a/ebean-core/src/test/java/org/tests/model/site/TreeEntity.java b/ebean-test/src/test/java/org/tests/model/site/TreeEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/site/TreeEntity.java rename to ebean-test/src/test/java/org/tests/model/site/TreeEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java b/ebean-test/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java rename to ebean-test/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java rename to ebean-test/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/EBasicSDChild.java b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSDChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/EBasicSDChild.java rename to ebean-test/src/test/java/org/tests/model/softdelete/EBasicSDChild.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java rename to ebean-test/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelBook.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelBook.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelDown.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelDown.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelDown.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelDown.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelMid.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelMid.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelMid.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelMid.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelRole.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelRole.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelRole.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelRole.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelTop.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelTop.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelTop.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelTop.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelUp.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUp.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelUp.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUp.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelUser.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelUser.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUser.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelX.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelX.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelY.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelY.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelZ.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelZ.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/ESoftDelZ.java rename to ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelZ.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/EsdDetail.java b/ebean-test/src/test/java/org/tests/model/softdelete/EsdDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/EsdDetail.java rename to ebean-test/src/test/java/org/tests/model/softdelete/EsdDetail.java diff --git a/ebean-core/src/test/java/org/tests/model/softdelete/EsdMaster.java b/ebean-test/src/test/java/org/tests/model/softdelete/EsdMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/softdelete/EsdMaster.java rename to ebean-test/src/test/java/org/tests/model/softdelete/EsdMaster.java diff --git a/ebean-core/src/test/java/org/tests/model/survey/Category.java b/ebean-test/src/test/java/org/tests/model/survey/Category.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/survey/Category.java rename to ebean-test/src/test/java/org/tests/model/survey/Category.java diff --git a/ebean-core/src/test/java/org/tests/model/survey/Group.java b/ebean-test/src/test/java/org/tests/model/survey/Group.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/survey/Group.java rename to ebean-test/src/test/java/org/tests/model/survey/Group.java diff --git a/ebean-core/src/test/java/org/tests/model/survey/Question.java b/ebean-test/src/test/java/org/tests/model/survey/Question.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/survey/Question.java rename to ebean-test/src/test/java/org/tests/model/survey/Question.java diff --git a/ebean-core/src/test/java/org/tests/model/survey/Survey.java b/ebean-test/src/test/java/org/tests/model/survey/Survey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/survey/Survey.java rename to ebean-test/src/test/java/org/tests/model/survey/Survey.java diff --git a/ebean-core/src/test/java/org/tests/model/survey/TestOrderByFetch.java b/ebean-test/src/test/java/org/tests/model/survey/TestOrderByFetch.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/survey/TestOrderByFetch.java rename to ebean-test/src/test/java/org/tests/model/survey/TestOrderByFetch.java diff --git a/ebean-core/src/test/java/org/tests/model/tevent/TEvent.java b/ebean-test/src/test/java/org/tests/model/tevent/TEvent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/tevent/TEvent.java rename to ebean-test/src/test/java/org/tests/model/tevent/TEvent.java diff --git a/ebean-core/src/test/java/org/tests/model/tevent/TEventMany.java b/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/tevent/TEventMany.java rename to ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java diff --git a/ebean-core/src/test/java/org/tests/model/tevent/TEventOne.java b/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/tevent/TEventOne.java rename to ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java diff --git a/ebean-core/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java b/ebean-test/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java rename to ebean-test/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java diff --git a/ebean-core/src/test/java/org/tests/model/types/SomeFileBean.java b/ebean-test/src/test/java/org/tests/model/types/SomeFileBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/types/SomeFileBean.java rename to ebean-test/src/test/java/org/tests/model/types/SomeFileBean.java diff --git a/ebean-core/src/test/java/org/tests/model/types/SomeNewTypesBean.java b/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/types/SomeNewTypesBean.java rename to ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java diff --git a/ebean-core/src/test/java/org/tests/model/types/SomePeriodBean.java b/ebean-test/src/test/java/org/tests/model/types/SomePeriodBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/types/SomePeriodBean.java rename to ebean-test/src/test/java/org/tests/model/types/SomePeriodBean.java diff --git a/ebean-core/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java rename to ebean-test/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java diff --git a/ebean-core/src/test/java/org/tests/model/uuidsibling/USibChild.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/uuidsibling/USibChild.java rename to ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java diff --git a/ebean-core/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java rename to ebean-test/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java diff --git a/ebean-core/src/test/java/org/tests/model/uuidsibling/USibParent.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/uuidsibling/USibParent.java rename to ebean-test/src/test/java/org/tests/model/uuidsibling/USibParent.java diff --git a/ebean-core/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java b/ebean-test/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java rename to ebean-test/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java diff --git a/ebean-core/src/test/java/org/tests/model/version/VersionChild.java b/ebean-test/src/test/java/org/tests/model/version/VersionChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/version/VersionChild.java rename to ebean-test/src/test/java/org/tests/model/version/VersionChild.java diff --git a/ebean-core/src/test/java/org/tests/model/version/VersionParent.java b/ebean-test/src/test/java/org/tests/model/version/VersionParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/version/VersionParent.java rename to ebean-test/src/test/java/org/tests/model/version/VersionParent.java diff --git a/ebean-core/src/test/java/org/tests/model/version/VersionToy.java b/ebean-test/src/test/java/org/tests/model/version/VersionToy.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/version/VersionToy.java rename to ebean-test/src/test/java/org/tests/model/version/VersionToy.java diff --git a/ebean-core/src/test/java/org/tests/model/view/EOrderAgg.java b/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/view/EOrderAgg.java rename to ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java diff --git a/ebean-core/src/test/java/org/tests/model/view/TestViewBaseEntity.java b/ebean-test/src/test/java/org/tests/model/view/TestViewBaseEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/view/TestViewBaseEntity.java rename to ebean-test/src/test/java/org/tests/model/view/TestViewBaseEntity.java diff --git a/ebean-core/src/test/java/org/tests/model/zero/TestWithZero.java b/ebean-test/src/test/java/org/tests/model/zero/TestWithZero.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/zero/TestWithZero.java rename to ebean-test/src/test/java/org/tests/model/zero/TestWithZero.java diff --git a/ebean-core/src/test/java/org/tests/model/zero/WithZero.java b/ebean-test/src/test/java/org/tests/model/zero/WithZero.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/zero/WithZero.java rename to ebean-test/src/test/java/org/tests/model/zero/WithZero.java diff --git a/ebean-core/src/test/java/org/tests/model/zero/WithZeroParent.java b/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/model/zero/WithZeroParent.java rename to ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java diff --git a/ebean-core/src/test/java/org/tests/o2m/OMVertex.java b/ebean-test/src/test/java/org/tests/o2m/OMVertex.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/OMVertex.java rename to ebean-test/src/test/java/org/tests/o2m/OMVertex.java diff --git a/ebean-core/src/test/java/org/tests/o2m/OMVertexOther.java b/ebean-test/src/test/java/org/tests/o2m/OMVertexOther.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/OMVertexOther.java rename to ebean-test/src/test/java/org/tests/o2m/OMVertexOther.java diff --git a/ebean-core/src/test/java/org/tests/o2m/OmAccountChildDBO.java b/ebean-test/src/test/java/org/tests/o2m/OmAccountChildDBO.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/OmAccountChildDBO.java rename to ebean-test/src/test/java/org/tests/o2m/OmAccountChildDBO.java diff --git a/ebean-core/src/test/java/org/tests/o2m/OmAccountDBO.java b/ebean-test/src/test/java/org/tests/o2m/OmAccountDBO.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/OmAccountDBO.java rename to ebean-test/src/test/java/org/tests/o2m/OmAccountDBO.java diff --git a/ebean-core/src/test/java/org/tests/o2m/OmBasicChild.java b/ebean-test/src/test/java/org/tests/o2m/OmBasicChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/OmBasicChild.java rename to ebean-test/src/test/java/org/tests/o2m/OmBasicChild.java diff --git a/ebean-core/src/test/java/org/tests/o2m/OmBasicParent.java b/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/OmBasicParent.java rename to ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java rename to ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java rename to ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWhere.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/TestOneToManyWhere.java rename to ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWildcard.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWildcard.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/TestOneToManyWildcard.java rename to ebean-test/src/test/java/org/tests/o2m/TestOneToManyWildcard.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/JtMonkey.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/JtMonkey.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkey.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/JtTrainer.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/JtTrainer.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/JtTroop.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/JtTroop.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java rename to ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java diff --git a/ebean-core/src/test/java/org/tests/o2m/lazy/OmlBar.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/lazy/OmlBar.java rename to ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java diff --git a/ebean-core/src/test/java/org/tests/o2m/lazy/OmlBaz.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBaz.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/lazy/OmlBaz.java rename to ebean-test/src/test/java/org/tests/o2m/lazy/OmlBaz.java diff --git a/ebean-core/src/test/java/org/tests/o2m/lazy/OmlFoo.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/lazy/OmlFoo.java rename to ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java diff --git a/ebean-core/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java b/ebean-test/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java rename to ebean-test/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java diff --git a/ebean-core/src/test/java/org/tests/o2o/OtoLevelA.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2o/OtoLevelA.java rename to ebean-test/src/test/java/org/tests/o2o/OtoLevelA.java diff --git a/ebean-core/src/test/java/org/tests/o2o/OtoLevelB.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2o/OtoLevelB.java rename to ebean-test/src/test/java/org/tests/o2o/OtoLevelB.java diff --git a/ebean-core/src/test/java/org/tests/o2o/OtoLevelC.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelC.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2o/OtoLevelC.java rename to ebean-test/src/test/java/org/tests/o2o/OtoLevelC.java diff --git a/ebean-core/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java b/ebean-test/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java rename to ebean-test/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java diff --git a/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java b/ebean-test/src/test/java/org/tests/o2o/TestReferenceSave.java similarity index 100% rename from ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java rename to ebean-test/src/test/java/org/tests/o2o/TestReferenceSave.java diff --git a/ebean-core/src/test/java/org/tests/order/OrderMaster.java b/ebean-test/src/test/java/org/tests/order/OrderMaster.java similarity index 100% rename from ebean-core/src/test/java/org/tests/order/OrderMaster.java rename to ebean-test/src/test/java/org/tests/order/OrderMaster.java diff --git a/ebean-core/src/test/java/org/tests/order/OrderReferencedChild.java b/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java similarity index 100% rename from ebean-core/src/test/java/org/tests/order/OrderReferencedChild.java rename to ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java diff --git a/ebean-core/src/test/java/org/tests/order/OrderReferencedParent.java b/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/order/OrderReferencedParent.java rename to ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java diff --git a/ebean-core/src/test/java/org/tests/order/OrderToy.java b/ebean-test/src/test/java/org/tests/order/OrderToy.java similarity index 100% rename from ebean-core/src/test/java/org/tests/order/OrderToy.java rename to ebean-test/src/test/java/org/tests/order/OrderToy.java diff --git a/ebean-core/src/test/java/org/tests/order/TestOrderColumn.java b/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java similarity index 100% rename from ebean-core/src/test/java/org/tests/order/TestOrderColumn.java rename to ebean-test/src/test/java/org/tests/order/TestOrderColumn.java diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java similarity index 100% rename from ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java rename to ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java similarity index 100% rename from ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java rename to ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java similarity index 100% rename from ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java rename to ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java similarity index 100% rename from ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java rename to ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java diff --git a/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java b/ebean-test/src/test/java/org/tests/profile/ProfileLocationTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java rename to ebean-test/src/test/java/org/tests/profile/ProfileLocationTest.java diff --git a/ebean-core/src/test/java/org/tests/profile/ProfileSimpleQuery.java b/ebean-test/src/test/java/org/tests/profile/ProfileSimpleQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/profile/ProfileSimpleQuery.java rename to ebean-test/src/test/java/org/tests/profile/ProfileSimpleQuery.java diff --git a/ebean-core/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java rename to ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java diff --git a/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java b/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java rename to ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java diff --git a/ebean-core/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java b/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java rename to ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java diff --git a/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java b/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java rename to ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java diff --git a/ebean-core/src/test/java/org/tests/query/TestExprNestedDisjunction.java b/ebean-test/src/test/java/org/tests/query/TestExprNestedDisjunction.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestExprNestedDisjunction.java rename to ebean-test/src/test/java/org/tests/query/TestExprNestedDisjunction.java diff --git a/ebean-core/src/test/java/org/tests/query/TestFindOneOrEmpty.java b/ebean-test/src/test/java/org/tests/query/TestFindOneOrEmpty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestFindOneOrEmpty.java rename to ebean-test/src/test/java/org/tests/query/TestFindOneOrEmpty.java diff --git a/ebean-core/src/test/java/org/tests/query/TestIContains.java b/ebean-test/src/test/java/org/tests/query/TestIContains.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestIContains.java rename to ebean-test/src/test/java/org/tests/query/TestIContains.java diff --git a/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java b/ebean-test/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java rename to ebean-test/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java diff --git a/ebean-core/src/test/java/org/tests/query/TestInvalidFetchPath.java b/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestInvalidFetchPath.java rename to ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java diff --git a/ebean-core/src/test/java/org/tests/query/TestJoinOptOneCascade.java b/ebean-test/src/test/java/org/tests/query/TestJoinOptOneCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestJoinOptOneCascade.java rename to ebean-test/src/test/java/org/tests/query/TestJoinOptOneCascade.java diff --git a/ebean-core/src/test/java/org/tests/query/TestLimitAlterFetchMany.java b/ebean-test/src/test/java/org/tests/query/TestLimitAlterFetchMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestLimitAlterFetchMany.java rename to ebean-test/src/test/java/org/tests/query/TestLimitAlterFetchMany.java diff --git a/ebean-core/src/test/java/org/tests/query/TestLimitQuery.java b/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestLimitQuery.java rename to ebean-test/src/test/java/org/tests/query/TestLimitQuery.java diff --git a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java b/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java rename to ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java diff --git a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoinM2M.java b/ebean-test/src/test/java/org/tests/query/TestManyWhereJoinM2M.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestManyWhereJoinM2M.java rename to ebean-test/src/test/java/org/tests/query/TestManyWhereJoinM2M.java diff --git a/ebean-core/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java b/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java rename to ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java diff --git a/ebean-core/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java b/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java rename to ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java diff --git a/ebean-core/src/test/java/org/tests/query/TestOuterJoin.java b/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestOuterJoin.java rename to ebean-test/src/test/java/org/tests/query/TestOuterJoin.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryAlias.java b/ebean-test/src/test/java/org/tests/query/TestQueryAlias.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryAlias.java rename to ebean-test/src/test/java/org/tests/query/TestQueryAlias.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryBaseTable.java b/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryBaseTable.java rename to ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryExists.java b/ebean-test/src/test/java/org/tests/query/TestQueryExists.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryExists.java rename to ebean-test/src/test/java/org/tests/query/TestQueryExists.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchSkipPath.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFetchSkipPath.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindFutureList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindFutureList.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindPagedList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindPagedList.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindReadOnly.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindReadOnly.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindStream.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryFindStream.java rename to ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryInAssocOne.java b/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryInAssocOne.java rename to ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java b/ebean-test/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java rename to ebean-test/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryIsNull.java b/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryIsNull.java rename to ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java b/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java rename to ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java b/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java rename to ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryMultiManyOrder.java b/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryMultiManyOrder.java rename to ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryNullAssocOne.java b/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryNullAssocOne.java rename to ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryOrderById.java b/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryOrderById.java rename to ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java b/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java rename to ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java b/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java rename to ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java diff --git a/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java b/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java rename to ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java diff --git a/ebean-core/src/test/java/org/tests/query/TestRowCount.java b/ebean-test/src/test/java/org/tests/query/TestRowCount.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestRowCount.java rename to ebean-test/src/test/java/org/tests/query/TestRowCount.java diff --git a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java b/ebean-test/src/test/java/org/tests/query/TestSubQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestSubQuery.java rename to ebean-test/src/test/java/org/tests/query/TestSubQuery.java diff --git a/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java b/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java rename to ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java diff --git a/ebean-core/src/test/java/org/tests/query/TestWhereIn.java b/ebean-test/src/test/java/org/tests/query/TestWhereIn.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestWhereIn.java rename to ebean-test/src/test/java/org/tests/query/TestWhereIn.java diff --git a/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java b/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java rename to ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java diff --git a/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java rename to ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java diff --git a/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java b/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java rename to ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java diff --git a/ebean-core/src/test/java/org/tests/query/cache/Acl.java b/ebean-test/src/test/java/org/tests/query/cache/Acl.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cache/Acl.java rename to ebean-test/src/test/java/org/tests/query/cache/Acl.java diff --git a/ebean-core/src/test/java/org/tests/query/cache/AclContainerRelation.java b/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cache/AclContainerRelation.java rename to ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java diff --git a/ebean-core/src/test/java/org/tests/query/cache/Contract.java b/ebean-test/src/test/java/org/tests/query/cache/Contract.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cache/Contract.java rename to ebean-test/src/test/java/org/tests/query/cache/Contract.java diff --git a/ebean-core/src/test/java/org/tests/query/cache/ContractCosts.java b/ebean-test/src/test/java/org/tests/query/cache/ContractCosts.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cache/ContractCosts.java rename to ebean-test/src/test/java/org/tests/query/cache/ContractCosts.java diff --git a/ebean-core/src/test/java/org/tests/query/cache/Main1.java b/ebean-test/src/test/java/org/tests/query/cache/Main1.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cache/Main1.java rename to ebean-test/src/test/java/org/tests/query/cache/Main1.java diff --git a/ebean-core/src/test/java/org/tests/query/cache/Main2.java b/ebean-test/src/test/java/org/tests/query/cache/Main2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cache/Main2.java rename to ebean-test/src/test/java/org/tests/query/cache/Main2.java diff --git a/ebean-core/src/test/java/org/tests/query/cache/Position.java b/ebean-test/src/test/java/org/tests/query/cache/Position.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cache/Position.java rename to ebean-test/src/test/java/org/tests/query/cache/Position.java diff --git a/ebean-core/src/test/java/org/tests/query/cache/TestDistinct.java b/ebean-test/src/test/java/org/tests/query/cache/TestDistinct.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cache/TestDistinct.java rename to ebean-test/src/test/java/org/tests/query/cache/TestDistinct.java diff --git a/ebean-core/src/test/java/org/tests/query/cancel/EBasicDto.java b/ebean-test/src/test/java/org/tests/query/cancel/EBasicDto.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cancel/EBasicDto.java rename to ebean-test/src/test/java/org/tests/query/cancel/EBasicDto.java diff --git a/ebean-core/src/test/java/org/tests/query/cancel/SlowDownEBasic.java b/ebean-test/src/test/java/org/tests/query/cancel/SlowDownEBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cancel/SlowDownEBasic.java rename to ebean-test/src/test/java/org/tests/query/cancel/SlowDownEBasic.java diff --git a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java rename to ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java diff --git a/ebean-core/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java b/ebean-test/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java rename to ebean-test/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java diff --git a/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java b/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java rename to ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java diff --git a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java rename to ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java b/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java rename to ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java b/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java rename to ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java rename to ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java rename to ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java rename to ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java rename to ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java diff --git a/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java b/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java rename to ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByClear.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/orderby/TestOrderByClear.java rename to ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java rename to ebean-test/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java rename to ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java rename to ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java rename to ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java rename to ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFetchPreference.java b/ebean-test/src/test/java/org/tests/query/other/TestFetchPreference.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestFetchPreference.java rename to ebean-test/src/test/java/org/tests/query/other/TestFetchPreference.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java b/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java rename to ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java b/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java rename to ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java b/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java rename to ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java b/ebean-test/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java rename to ebean-test/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java b/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java rename to ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestLikeEscaping.java b/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestLikeEscaping.java rename to ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java b/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java rename to ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java b/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java rename to ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestOneToManyAsMap.java b/ebean-test/src/test/java/org/tests/query/other/TestOneToManyAsMap.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestOneToManyAsMap.java rename to ebean-test/src/test/java/org/tests/query/other/TestOneToManyAsMap.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java rename to ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryDistinct.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestQueryDistinct.java rename to ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java rename to ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java rename to ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java rename to ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestSelfParent.java b/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestSelfParent.java rename to ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java b/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java rename to ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestWhereAnnotation.java b/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestWhereAnnotation.java rename to ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java diff --git a/ebean-core/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java b/ebean-test/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java rename to ebean-test/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java diff --git a/ebean-core/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java b/ebean-test/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java rename to ebean-test/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java diff --git a/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java rename to ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java diff --git a/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java b/ebean-test/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java similarity index 100% rename from ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java rename to ebean-test/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java diff --git a/ebean-core/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java b/ebean-test/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java rename to ebean-test/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/A2Customer.java b/ebean-test/src/test/java/org/tests/rawsql/A2Customer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/A2Customer.java rename to ebean-test/src/test/java/org/tests/rawsql/A2Customer.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/ACustomer.java b/ebean-test/src/test/java/org/tests/rawsql/ACustomer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/ACustomer.java rename to ebean-test/src/test/java/org/tests/rawsql/ACustomer.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java b/ebean-test/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java rename to ebean-test/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestOrderReportTotal.java b/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestOrderReportTotal.java rename to ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java rename to ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java rename to ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java rename to ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java rename to ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java diff --git a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java similarity index 100% rename from ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java rename to ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java diff --git a/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java b/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java similarity index 100% rename from ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java rename to ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java diff --git a/ebean-core/src/test/java/org/tests/refresh/TestRefreshWithMany.java b/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/refresh/TestRefreshWithMany.java rename to ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java diff --git a/ebean-core/src/test/java/org/tests/repository/CustomerRepository.java b/ebean-test/src/test/java/org/tests/repository/CustomerRepository.java similarity index 100% rename from ebean-core/src/test/java/org/tests/repository/CustomerRepository.java rename to ebean-test/src/test/java/org/tests/repository/CustomerRepository.java diff --git a/ebean-core/src/test/java/org/tests/repository/TestBeanRepository.java b/ebean-test/src/test/java/org/tests/repository/TestBeanRepository.java similarity index 100% rename from ebean-core/src/test/java/org/tests/repository/TestBeanRepository.java rename to ebean-test/src/test/java/org/tests/repository/TestBeanRepository.java diff --git a/ebean-core/src/test/java/org/tests/saveassociation/TestSaveAssociation.java b/ebean-test/src/test/java/org/tests/saveassociation/TestSaveAssociation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/saveassociation/TestSaveAssociation.java rename to ebean-test/src/test/java/org/tests/saveassociation/TestSaveAssociation.java diff --git a/ebean-core/src/test/java/org/tests/saveassociation/TestSaveSamePK.java b/ebean-test/src/test/java/org/tests/saveassociation/TestSaveSamePK.java similarity index 100% rename from ebean-core/src/test/java/org/tests/saveassociation/TestSaveSamePK.java rename to ebean-test/src/test/java/org/tests/saveassociation/TestSaveSamePK.java diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java similarity index 100% rename from ebean-core/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java rename to ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java rename to ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java similarity index 100% rename from ebean-core/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java rename to ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java similarity index 100% rename from ebean-core/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java rename to ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/model/Zone.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java similarity index 100% rename from ebean-core/src/test/java/org/tests/singleTableInheritance/model/Zone.java rename to ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java similarity index 100% rename from ebean-core/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java rename to ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java similarity index 100% rename from ebean-core/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java rename to ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java similarity index 100% rename from ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java rename to ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java similarity index 100% rename from ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java rename to ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java rename to ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java similarity index 100% rename from ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java rename to ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java rename to ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java rename to ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java similarity index 100% rename from ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java rename to ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java diff --git a/ebean-core/src/test/java/org/tests/sp/TestManyToManySaveTwice.java b/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java similarity index 100% rename from ebean-core/src/test/java/org/tests/sp/TestManyToManySaveTwice.java rename to ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java diff --git a/ebean-core/src/test/java/org/tests/sp/model/IdEntity.java b/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java similarity index 100% rename from ebean-core/src/test/java/org/tests/sp/model/IdEntity.java rename to ebean-test/src/test/java/org/tests/sp/model/IdEntity.java diff --git a/ebean-core/src/test/java/org/tests/sp/model/car/Car.java b/ebean-test/src/test/java/org/tests/sp/model/car/Car.java similarity index 100% rename from ebean-core/src/test/java/org/tests/sp/model/car/Car.java rename to ebean-test/src/test/java/org/tests/sp/model/car/Car.java diff --git a/ebean-core/src/test/java/org/tests/sp/model/car/Door.java b/ebean-test/src/test/java/org/tests/sp/model/car/Door.java similarity index 100% rename from ebean-core/src/test/java/org/tests/sp/model/car/Door.java rename to ebean-test/src/test/java/org/tests/sp/model/car/Door.java diff --git a/ebean-core/src/test/java/org/tests/sp/model/car/Wheel.java b/ebean-test/src/test/java/org/tests/sp/model/car/Wheel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/sp/model/car/Wheel.java rename to ebean-test/src/test/java/org/tests/sp/model/car/Wheel.java diff --git a/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java b/ebean-test/src/test/java/org/tests/test/TestInheritWithMany.java similarity index 100% rename from ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java rename to ebean-test/src/test/java/org/tests/test/TestInheritWithMany.java diff --git a/ebean-core/src/test/java/org/tests/text/csv/TestCsvReader.java b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/csv/TestCsvReader.java rename to ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java diff --git a/ebean-core/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java rename to ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java diff --git a/ebean-core/src/test/java/org/tests/text/csv/TestTimeStringParser.java b/ebean-test/src/test/java/org/tests/text/csv/TestTimeStringParser.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/csv/TestTimeStringParser.java rename to ebean-test/src/test/java/org/tests/text/csv/TestTimeStringParser.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java rename to ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java rename to ebean-test/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java rename to ebean-test/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonMap.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestJsonMap.java rename to ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonSimple.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestJsonSimple.java rename to ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java rename to ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInheritance.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonInheritance.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSimple.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSimple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonSimple.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonSimple.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java rename to ebean-test/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java diff --git a/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java b/ebean-test/src/test/java/org/tests/timezone/TimezoneTests.java similarity index 100% rename from ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java rename to ebean-test/src/test/java/org/tests/timezone/TimezoneTests.java diff --git a/ebean-core/src/test/java/org/tests/timezone/TzBean.java b/ebean-test/src/test/java/org/tests/timezone/TzBean.java similarity index 100% rename from ebean-core/src/test/java/org/tests/timezone/TzBean.java rename to ebean-test/src/test/java/org/tests/timezone/TzBean.java diff --git a/ebean-core/src/test/java/org/tests/timezone/TzBeanTests.java b/ebean-test/src/test/java/org/tests/timezone/TzBeanTests.java similarity index 100% rename from ebean-core/src/test/java/org/tests/timezone/TzBeanTests.java rename to ebean-test/src/test/java/org/tests/timezone/TzBeanTests.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBatchModelFlush.java b/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestBatchModelFlush.java rename to ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBatchPersistCascade.java b/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestBatchPersistCascade.java rename to ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java rename to ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java b/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java rename to ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestCommitAndContinue.java b/ebean-test/src/test/java/org/tests/transaction/TestCommitAndContinue.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestCommitAndContinue.java rename to ebean-test/src/test/java/org/tests/transaction/TestCommitAndContinue.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java b/ebean-test/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java rename to ebean-test/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java b/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java rename to ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java b/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java rename to ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestInsertManyAndRef.java b/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestInsertManyAndRef.java rename to ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNested.java b/ebean-test/src/test/java/org/tests/transaction/TestNested.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestNested.java rename to ebean-test/src/test/java/org/tests/transaction/TestNested.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequired.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequired.java rename to ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java rename to ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java rename to ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java rename to ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedMandatory.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java rename to ebean-test/src/test/java/org/tests/transaction/TestNestedMandatory.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestNestedSubTransaction.java rename to ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedTransaction.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedTransaction.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestNestedTransaction.java rename to ebean-test/src/test/java/org/tests/transaction/TestNestedTransaction.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestPersistContextClear.java b/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestPersistContextClear.java rename to ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java b/ebean-test/src/test/java/org/tests/transaction/TestSavepoint.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java rename to ebean-test/src/test/java/org/tests/transaction/TestSavepoint.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java b/ebean-test/src/test/java/org/tests/transaction/TestSqlServerBatch.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java rename to ebean-test/src/test/java/org/tests/transaction/TestSqlServerBatch.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java b/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java rename to ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionSkipCache.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionSkipCache.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionTryResources.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionTryResources.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNever.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionalNever.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequired.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequired.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalSupports.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalSupports.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionalSupports.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionalSupports.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java rename to ebean-test/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java diff --git a/ebean-core/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java b/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java rename to ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java diff --git a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java similarity index 100% rename from ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java rename to ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java diff --git a/ebean-core/src/test/java/org/tests/types/EncryptedBinary.java b/ebean-test/src/test/java/org/tests/types/EncryptedBinary.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/EncryptedBinary.java rename to ebean-test/src/test/java/org/tests/types/EncryptedBinary.java diff --git a/ebean-core/src/test/java/org/tests/types/EncryptedString.java b/ebean-test/src/test/java/org/tests/types/EncryptedString.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/EncryptedString.java rename to ebean-test/src/test/java/org/tests/types/EncryptedString.java diff --git a/ebean-core/src/test/java/org/tests/types/PasswordStoreModel.java b/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/PasswordStoreModel.java rename to ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java diff --git a/ebean-core/src/test/java/org/tests/types/ScalarTypeEncryptedBinaryConverter.java b/ebean-test/src/test/java/org/tests/types/ScalarTypeEncryptedBinaryConverter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/ScalarTypeEncryptedBinaryConverter.java rename to ebean-test/src/test/java/org/tests/types/ScalarTypeEncryptedBinaryConverter.java diff --git a/ebean-core/src/test/java/org/tests/types/ScalarTypeEncryptedStringConverter.java b/ebean-test/src/test/java/org/tests/types/ScalarTypeEncryptedStringConverter.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/ScalarTypeEncryptedStringConverter.java rename to ebean-test/src/test/java/org/tests/types/ScalarTypeEncryptedStringConverter.java diff --git a/ebean-core/src/test/java/org/tests/types/TestEncryptedString.java b/ebean-test/src/test/java/org/tests/types/TestEncryptedString.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/TestEncryptedString.java rename to ebean-test/src/test/java/org/tests/types/TestEncryptedString.java diff --git a/ebean-core/src/test/java/org/tests/types/TestFileType.java b/ebean-test/src/test/java/org/tests/types/TestFileType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/TestFileType.java rename to ebean-test/src/test/java/org/tests/types/TestFileType.java diff --git a/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java b/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java rename to ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java diff --git a/ebean-core/src/test/java/org/tests/types/TestHstore.java b/ebean-test/src/test/java/org/tests/types/TestHstore.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/TestHstore.java rename to ebean-test/src/test/java/org/tests/types/TestHstore.java diff --git a/ebean-core/src/test/java/org/tests/types/TestNewTypes.java b/ebean-test/src/test/java/org/tests/types/TestNewTypes.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/TestNewTypes.java rename to ebean-test/src/test/java/org/tests/types/TestNewTypes.java diff --git a/ebean-core/src/test/java/org/tests/types/TestPeriodType.java b/ebean-test/src/test/java/org/tests/types/TestPeriodType.java similarity index 100% rename from ebean-core/src/test/java/org/tests/types/TestPeriodType.java rename to ebean-test/src/test/java/org/tests/types/TestPeriodType.java diff --git a/ebean-core/src/test/java/org/tests/unidirectional/TestUniDirectional.java b/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java similarity index 100% rename from ebean-core/src/test/java/org/tests/unidirectional/TestUniDirectional.java rename to ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java diff --git a/ebean-core/src/test/java/org/tests/unitinternal/HelloMain.java b/ebean-test/src/test/java/org/tests/unitinternal/HelloMain.java similarity index 100% rename from ebean-core/src/test/java/org/tests/unitinternal/HelloMain.java rename to ebean-test/src/test/java/org/tests/unitinternal/HelloMain.java diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java b/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java similarity index 100% rename from ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java rename to ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestNamingConvention.java b/ebean-test/src/test/java/org/tests/unitinternal/TestNamingConvention.java similarity index 100% rename from ebean-core/src/test/java/org/tests/unitinternal/TestNamingConvention.java rename to ebean-test/src/test/java/org/tests/unitinternal/TestNamingConvention.java diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java b/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java similarity index 100% rename from ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java rename to ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java similarity index 100% rename from ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java rename to ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java b/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java similarity index 100% rename from ebean-core/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java rename to ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java b/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java similarity index 100% rename from ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java rename to ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java diff --git a/ebean-core/src/test/java/org/tests/update/EPersonOnline.java b/ebean-test/src/test/java/org/tests/update/EPersonOnline.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/EPersonOnline.java rename to ebean-test/src/test/java/org/tests/update/EPersonOnline.java diff --git a/ebean-core/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java b/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java rename to ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java diff --git a/ebean-core/src/test/java/org/tests/update/TestJsonStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestJsonStatelessUpdate.java rename to ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java diff --git a/ebean-core/src/test/java/org/tests/update/TestMarkAsDirty.java b/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestMarkAsDirty.java rename to ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java diff --git a/ebean-core/src/test/java/org/tests/update/TestPostgresTruncate.java b/ebean-test/src/test/java/org/tests/update/TestPostgresTruncate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestPostgresTruncate.java rename to ebean-test/src/test/java/org/tests/update/TestPostgresTruncate.java diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBatch.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBatch.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestSqlUpdateBatch.java rename to ebean-test/src/test/java/org/tests/update/TestSqlUpdateBatch.java diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java rename to ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateExceptions.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestSqlUpdateExceptions.java rename to ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java rename to ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateUpsert.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestSqlUpdateUpsert.java rename to ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java diff --git a/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java rename to ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java b/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java rename to ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdateCircularSave.java b/ebean-test/src/test/java/org/tests/update/TestUpdateCircularSave.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestUpdateCircularSave.java rename to ebean-test/src/test/java/org/tests/update/TestUpdateCircularSave.java diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdatePartial.java b/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestUpdatePartial.java rename to ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdatePartialNoVer.java b/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/TestUpdatePartialNoVer.java rename to ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java diff --git a/ebean-core/src/test/java/org/tests/update/objects/Child.java b/ebean-test/src/test/java/org/tests/update/objects/Child.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/objects/Child.java rename to ebean-test/src/test/java/org/tests/update/objects/Child.java diff --git a/ebean-core/src/test/java/org/tests/update/objects/Parent.java b/ebean-test/src/test/java/org/tests/update/objects/Parent.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/objects/Parent.java rename to ebean-test/src/test/java/org/tests/update/objects/Parent.java diff --git a/ebean-core/src/test/java/org/tests/update/objects/SiblingA.java b/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/objects/SiblingA.java rename to ebean-test/src/test/java/org/tests/update/objects/SiblingA.java diff --git a/ebean-core/src/test/java/org/tests/update/objects/SiblingB.java b/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java similarity index 100% rename from ebean-core/src/test/java/org/tests/update/objects/SiblingB.java rename to ebean-test/src/test/java/org/tests/update/objects/SiblingB.java diff --git a/ebean-core/src/test/resources/EQL.g4 b/ebean-test/src/test/resources/EQL.g4 similarity index 100% rename from ebean-core/src/test/resources/EQL.g4 rename to ebean-test/src/test/resources/EQL.g4 diff --git a/ebean-core/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory b/ebean-test/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory similarity index 100% rename from ebean-core/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory rename to ebean-test/src/test/resources/META-INF/services/io.ebeaninternal.api.SpiLoggerFactory diff --git a/ebean-core/src/test/resources/META-INF/test/test-agent-only-use.mf b/ebean-test/src/test/resources/META-INF/test/test-agent-only-use.mf similarity index 100% rename from ebean-core/src/test/resources/META-INF/test/test-agent-only-use.mf rename to ebean-test/src/test/resources/META-INF/test/test-agent-only-use.mf diff --git a/ebean-core/src/test/resources/META-INF/test/test-combined.mf b/ebean-test/src/test/resources/META-INF/test/test-combined.mf similarity index 100% rename from ebean-core/src/test/resources/META-INF/test/test-combined.mf rename to ebean-test/src/test/resources/META-INF/test/test-combined.mf diff --git a/ebean-core/src/test/resources/META-INF/test/test-entity-packages.mf b/ebean-test/src/test/resources/META-INF/test/test-entity-packages.mf similarity index 100% rename from ebean-core/src/test/resources/META-INF/test/test-entity-packages.mf rename to ebean-test/src/test/resources/META-INF/test/test-entity-packages.mf diff --git a/ebean-core/src/test/resources/META-INF/test/test-one.mf b/ebean-test/src/test/resources/META-INF/test/test-one.mf similarity index 100% rename from ebean-core/src/test/resources/META-INF/test/test-one.mf rename to ebean-test/src/test/resources/META-INF/test/test-one.mf diff --git a/ebean-core/src/test/resources/META-INF/test/test-some.mf b/ebean-test/src/test/resources/META-INF/test/test-some.mf similarity index 100% rename from ebean-core/src/test/resources/META-INF/test/test-some.mf rename to ebean-test/src/test/resources/META-INF/test/test-some.mf diff --git a/ebean-core/src/test/resources/docker-run.properties b/ebean-test/src/test/resources/docker-run.properties similarity index 100% rename from ebean-core/src/test/resources/docker-run.properties rename to ebean-test/src/test/resources/docker-run.properties diff --git a/ebean-test/src/test/resources/ebean.mf b/ebean-test/src/test/resources/ebean.mf index 86b6aa821..fc2fd6902 100644 --- a/ebean-test/src/test/resources/ebean.mf +++ b/ebean-test/src/test/resources/ebean.mf @@ -1,2 +1,7 @@ -entity-packages: org.test -transactional-packages: org.test +agent-use-only: true +profile-location: true +entity-packages: org,misc +transactional-packages: org +querybean-packages: none +synthetic: true + diff --git a/ebean-core/src/test/resources/ebean.properties b/ebean-test/src/test/resources/ebean.properties similarity index 99% rename from ebean-core/src/test/resources/ebean.properties rename to ebean-test/src/test/resources/ebean.properties index 49aae2a31..0fc9586f9 100644 --- a/ebean-core/src/test/resources/ebean.properties +++ b/ebean-test/src/test/resources/ebean.properties @@ -21,7 +21,7 @@ ebean.encryptKeyManager=org.tests.basic.encrypt.BasicEncyptKeyManager ebean.ddl.generate=true ebean.ddl.run=true ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp} -ebean.packages=org.tests +ebean.packages=org.tests,org.etest datasource.default=h2 #datasource.h2.capturestacktrace=true diff --git a/ebean-core/src/test/resources/example1.json b/ebean-test/src/test/resources/example1.json similarity index 100% rename from ebean-core/src/test/resources/example1.json rename to ebean-test/src/test/resources/example1.json diff --git a/ebean-core/src/test/resources/extra-ddl.xml b/ebean-test/src/test/resources/extra-ddl.xml similarity index 100% rename from ebean-core/src/test/resources/extra-ddl.xml rename to ebean-test/src/test/resources/extra-ddl.xml diff --git a/ebean-core/src/test/resources/java-64.png b/ebean-test/src/test/resources/java-64.png similarity index 100% rename from ebean-core/src/test/resources/java-64.png rename to ebean-test/src/test/resources/java-64.png diff --git a/ebean-core/src/test/resources/junk.json b/ebean-test/src/test/resources/junk.json similarity index 100% rename from ebean-core/src/test/resources/junk.json rename to ebean-test/src/test/resources/junk.json diff --git a/ebean-test/src/test/resources/logback-test.xml b/ebean-test/src/test/resources/logback-test.xml index ce7ad5968..bfe4a1ede 100644 --- a/ebean-test/src/test/resources/logback-test.xml +++ b/ebean-test/src/test/resources/logback-test.xml @@ -1,22 +1,99 @@ + + TRACE + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + + target/log/application.log + + TRACE + + + log/application.log.%d{yyyy-MM-dd} + 90 + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + target/log/readAuditQuery.log + + log/readAuditQuery.log.%d{yyyy-MM-dd} + 90 + + + %d{HH:mm:ss.SSS} %msg%n + + + + + target/log/readAudit.log + + log/readAudit.log.%d{yyyy-MM-dd} + 90 + + + %d{HH:mm:ss.SSS} %msg%n + + + + + target/log/change-log.log + + log/changeLog.log.%d{yyyy-MM-dd} + 90 + + + %d{HH:mm:ss.SSS} %msg%n + + + + + + + + + + + + + + + + + - + + - + - - - + + + + + + + + + + + + + + + + diff --git a/ebean-test/src/test/resources/application-test.yaml b/ebean-test/src/test/resources/notused-application-test.yaml similarity index 100% rename from ebean-test/src/test/resources/application-test.yaml rename to ebean-test/src/test/resources/notused-application-test.yaml diff --git a/ebean-core/src/test/resources/profile-image.jpg b/ebean-test/src/test/resources/profile-image.jpg similarity index 100% rename from ebean-core/src/test/resources/profile-image.jpg rename to ebean-test/src/test/resources/profile-image.jpg diff --git a/ebean-core/src/test/resources/scripts/test-script-2.sql b/ebean-test/src/test/resources/scripts/test-script-2.sql similarity index 100% rename from ebean-core/src/test/resources/scripts/test-script-2.sql rename to ebean-test/src/test/resources/scripts/test-script-2.sql diff --git a/ebean-core/src/test/resources/scripts/test-script.sql b/ebean-test/src/test/resources/scripts/test-script.sql similarity index 100% rename from ebean-core/src/test/resources/scripts/test-script.sql rename to ebean-test/src/test/resources/scripts/test-script.sql diff --git a/ebean-core/src/test/resources/test-ebean.properties b/ebean-test/src/test/resources/test-ebean.properties similarity index 100% rename from ebean-core/src/test/resources/test-ebean.properties rename to ebean-test/src/test/resources/test-ebean.properties diff --git a/ebean-core/src/test/resources/test-properties/application.properties b/ebean-test/src/test/resources/test-properties/application.properties similarity index 100% rename from ebean-core/src/test/resources/test-properties/application.properties rename to ebean-test/src/test/resources/test-properties/application.properties diff --git a/ebean-core/src/test/resources/test-properties/application.yaml b/ebean-test/src/test/resources/test-properties/application.yaml similarity index 100% rename from ebean-core/src/test/resources/test-properties/application.yaml rename to ebean-test/src/test/resources/test-properties/application.yaml diff --git a/ebean-core/src/test/resources/test-properties/foo.yml b/ebean-test/src/test/resources/test-properties/foo.yml similarity index 100% rename from ebean-core/src/test/resources/test-properties/foo.yml rename to ebean-test/src/test/resources/test-properties/foo.yml diff --git a/ebean-core/src/test/resources/test-properties/one.properties b/ebean-test/src/test/resources/test-properties/one.properties similarity index 100% rename from ebean-core/src/test/resources/test-properties/one.properties rename to ebean-test/src/test/resources/test-properties/one.properties diff --git a/ebean-core/src/test/resources/test1.csv b/ebean-test/src/test/resources/test1.csv similarity index 100% rename from ebean-core/src/test/resources/test1.csv rename to ebean-test/src/test/resources/test1.csv