diff --git a/build.gradle b/build.gradle
index c1c4279..0ee2fc0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,6 +8,8 @@ defaultTasks 'assemble'
 
 repositories {
     mavenCentral()
+    maven { url 'http://repository.jboss.org/nexus/content/groups/public-jboss/' }
+    maven { url 'http://download.osgeo.org/webdav/geotools/' }
 }
 
 dependencies {
@@ -20,9 +22,9 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version:'3.8.2'
     testCompile group: 'httpunit', name: 'httpunit', version:'1.6'
     testCompile group: 'junitperf', name: 'junitperf', version:'1.9.1'
-    testCompile group: 'groboutils', name: 'groboutils-core', version:'5'
+    testCompile group: 'net.sourceforge.groboutils', name: 'groboutils-core', version:'5'
 }
 
 compileJava {
     // options.compilerArgs << '-Xlint:deprecation'
-}
+}
\ No newline at end of file
diff --git a/src/main/test/java/com/opensymphony/oscache/base/DummyAlwayRefreshEntryPolicy.java b/src/test/java/com/opensymphony/oscache/base/DummyAlwayRefreshEntryPolicy.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/DummyAlwayRefreshEntryPolicy.java
rename to src/test/java/com/opensymphony/oscache/base/DummyAlwayRefreshEntryPolicy.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/GroupConcurrencyProblemTestCase.java b/src/test/java/com/opensymphony/oscache/base/GroupConcurrencyProblemTestCase.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/GroupConcurrencyProblemTestCase.java
rename to src/test/java/com/opensymphony/oscache/base/GroupConcurrencyProblemTestCase.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/TestAbstractCacheAdministrator.java b/src/test/java/com/opensymphony/oscache/base/TestAbstractCacheAdministrator.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/TestAbstractCacheAdministrator.java
rename to src/test/java/com/opensymphony/oscache/base/TestAbstractCacheAdministrator.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/TestCache.java b/src/test/java/com/opensymphony/oscache/base/TestCache.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/TestCache.java
rename to src/test/java/com/opensymphony/oscache/base/TestCache.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/TestCacheEntry.java b/src/test/java/com/opensymphony/oscache/base/TestCacheEntry.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/TestCacheEntry.java
rename to src/test/java/com/opensymphony/oscache/base/TestCacheEntry.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/TestCompleteBase.java b/src/test/java/com/opensymphony/oscache/base/TestCompleteBase.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/TestCompleteBase.java
rename to src/test/java/com/opensymphony/oscache/base/TestCompleteBase.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/TestConcurrency.java b/src/test/java/com/opensymphony/oscache/base/TestConcurrency.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/TestConcurrency.java
rename to src/test/java/com/opensymphony/oscache/base/TestConcurrency.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/TestConcurrency2.java b/src/test/java/com/opensymphony/oscache/base/TestConcurrency2.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/TestConcurrency2.java
rename to src/test/java/com/opensymphony/oscache/base/TestConcurrency2.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/algorithm/TestAbstractCache.java b/src/test/java/com/opensymphony/oscache/base/algorithm/TestAbstractCache.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/algorithm/TestAbstractCache.java
rename to src/test/java/com/opensymphony/oscache/base/algorithm/TestAbstractCache.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/algorithm/TestCompleteAlgorithm.java b/src/test/java/com/opensymphony/oscache/base/algorithm/TestCompleteAlgorithm.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/algorithm/TestCompleteAlgorithm.java
rename to src/test/java/com/opensymphony/oscache/base/algorithm/TestCompleteAlgorithm.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/algorithm/TestFIFOCache.java b/src/test/java/com/opensymphony/oscache/base/algorithm/TestFIFOCache.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/algorithm/TestFIFOCache.java
rename to src/test/java/com/opensymphony/oscache/base/algorithm/TestFIFOCache.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/algorithm/TestLRUCache.java b/src/test/java/com/opensymphony/oscache/base/algorithm/TestLRUCache.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/algorithm/TestLRUCache.java
rename to src/test/java/com/opensymphony/oscache/base/algorithm/TestLRUCache.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/algorithm/TestQueueCache.java b/src/test/java/com/opensymphony/oscache/base/algorithm/TestQueueCache.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/algorithm/TestQueueCache.java
rename to src/test/java/com/opensymphony/oscache/base/algorithm/TestQueueCache.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/algorithm/TestUnlimitedCache.java b/src/test/java/com/opensymphony/oscache/base/algorithm/TestUnlimitedCache.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/algorithm/TestUnlimitedCache.java
rename to src/test/java/com/opensymphony/oscache/base/algorithm/TestUnlimitedCache.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/events/TestCacheEntryEvent.java b/src/test/java/com/opensymphony/oscache/base/events/TestCacheEntryEvent.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/events/TestCacheEntryEvent.java
rename to src/test/java/com/opensymphony/oscache/base/events/TestCacheEntryEvent.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/events/TestCacheGroupEvent.java b/src/test/java/com/opensymphony/oscache/base/events/TestCacheGroupEvent.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/events/TestCacheGroupEvent.java
rename to src/test/java/com/opensymphony/oscache/base/events/TestCacheGroupEvent.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/events/TestCacheMapAccessEvent.java b/src/test/java/com/opensymphony/oscache/base/events/TestCacheMapAccessEvent.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/events/TestCacheMapAccessEvent.java
rename to src/test/java/com/opensymphony/oscache/base/events/TestCacheMapAccessEvent.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/events/TestCachePatternEvent.java b/src/test/java/com/opensymphony/oscache/base/events/TestCachePatternEvent.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/events/TestCachePatternEvent.java
rename to src/test/java/com/opensymphony/oscache/base/events/TestCachePatternEvent.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/events/TestCachewideEvent.java b/src/test/java/com/opensymphony/oscache/base/events/TestCachewideEvent.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/events/TestCachewideEvent.java
rename to src/test/java/com/opensymphony/oscache/base/events/TestCachewideEvent.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/events/TestCompleteEvents.java b/src/test/java/com/opensymphony/oscache/base/events/TestCompleteEvents.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/events/TestCompleteEvents.java
rename to src/test/java/com/opensymphony/oscache/base/events/TestCompleteEvents.java
diff --git a/src/main/test/java/com/opensymphony/oscache/base/events/TestScopeEvent.java b/src/test/java/com/opensymphony/oscache/base/events/TestScopeEvent.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/base/events/TestScopeEvent.java
rename to src/test/java/com/opensymphony/oscache/base/events/TestScopeEvent.java
diff --git a/src/main/test/java/com/opensymphony/oscache/extra/TestCacheEntryEventListenerImpl.java b/src/test/java/com/opensymphony/oscache/extra/TestCacheEntryEventListenerImpl.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/extra/TestCacheEntryEventListenerImpl.java
rename to src/test/java/com/opensymphony/oscache/extra/TestCacheEntryEventListenerImpl.java
diff --git a/src/main/test/java/com/opensymphony/oscache/extra/TestCacheMapAccessEventListenerImpl.java b/src/test/java/com/opensymphony/oscache/extra/TestCacheMapAccessEventListenerImpl.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/extra/TestCacheMapAccessEventListenerImpl.java
rename to src/test/java/com/opensymphony/oscache/extra/TestCacheMapAccessEventListenerImpl.java
diff --git a/src/main/test/java/com/opensymphony/oscache/extra/TestCompleteExtra.java b/src/test/java/com/opensymphony/oscache/extra/TestCompleteExtra.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/extra/TestCompleteExtra.java
rename to src/test/java/com/opensymphony/oscache/extra/TestCompleteExtra.java
diff --git a/src/main/test/java/com/opensymphony/oscache/extra/TestScopeEventListenerImpl.java b/src/test/java/com/opensymphony/oscache/extra/TestScopeEventListenerImpl.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/extra/TestScopeEventListenerImpl.java
rename to src/test/java/com/opensymphony/oscache/extra/TestScopeEventListenerImpl.java
diff --git a/src/main/test/java/com/opensymphony/oscache/extra/TestStatisticListenerImpl.java b/src/test/java/com/opensymphony/oscache/extra/TestStatisticListenerImpl.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/extra/TestStatisticListenerImpl.java
rename to src/test/java/com/opensymphony/oscache/extra/TestStatisticListenerImpl.java
diff --git a/src/main/test/java/com/opensymphony/oscache/general/TestCompleteGeneral.java b/src/test/java/com/opensymphony/oscache/general/TestCompleteGeneral.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/general/TestCompleteGeneral.java
rename to src/test/java/com/opensymphony/oscache/general/TestCompleteGeneral.java
diff --git a/src/main/test/java/com/opensymphony/oscache/general/TestConcurrent.java b/src/test/java/com/opensymphony/oscache/general/TestConcurrent.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/general/TestConcurrent.java
rename to src/test/java/com/opensymphony/oscache/general/TestConcurrent.java
diff --git a/src/main/test/java/com/opensymphony/oscache/general/TestGeneralCacheAdministrator.java b/src/test/java/com/opensymphony/oscache/general/TestGeneralCacheAdministrator.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/general/TestGeneralCacheAdministrator.java
rename to src/test/java/com/opensymphony/oscache/general/TestGeneralCacheAdministrator.java
diff --git a/src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/BaseTestBroadcastingListener.java b/src/test/java/com/opensymphony/oscache/plugins/clustersupport/BaseTestBroadcastingListener.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/BaseTestBroadcastingListener.java
rename to src/test/java/com/opensymphony/oscache/plugins/clustersupport/BaseTestBroadcastingListener.java
diff --git a/src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/ListenForClusterTests.java b/src/test/java/com/opensymphony/oscache/plugins/clustersupport/ListenForClusterTests.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/ListenForClusterTests.java
rename to src/test/java/com/opensymphony/oscache/plugins/clustersupport/ListenForClusterTests.java
diff --git a/src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/TestCompleteClustering.java b/src/test/java/com/opensymphony/oscache/plugins/clustersupport/TestCompleteClustering.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/TestCompleteClustering.java
rename to src/test/java/com/opensymphony/oscache/plugins/clustersupport/TestCompleteClustering.java
diff --git a/src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJMS10BroadcastingListener.java b/src/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJMS10BroadcastingListener.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJMS10BroadcastingListener.java
rename to src/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJMS10BroadcastingListener.java
diff --git a/src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJMSBroadcastingListener.java b/src/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJMSBroadcastingListener.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJMSBroadcastingListener.java
rename to src/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJMSBroadcastingListener.java
diff --git a/src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJavaGroupsBroadcastingListener.java b/src/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJavaGroupsBroadcastingListener.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJavaGroupsBroadcastingListener.java
rename to src/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJavaGroupsBroadcastingListener.java
diff --git a/src/main/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestCompleteDiskPersistence.java b/src/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestCompleteDiskPersistence.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestCompleteDiskPersistence.java
rename to src/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestCompleteDiskPersistence.java
diff --git a/src/main/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestDiskPersistenceListener.java b/src/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestDiskPersistenceListener.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestDiskPersistenceListener.java
rename to src/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestDiskPersistenceListener.java
diff --git a/src/main/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestHashDiskPersistenceListener.java b/src/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestHashDiskPersistenceListener.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestHashDiskPersistenceListener.java
rename to src/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestHashDiskPersistenceListener.java
diff --git a/src/main/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestUnSerializable.java b/src/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestUnSerializable.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestUnSerializable.java
rename to src/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestUnSerializable.java
diff --git a/src/main/test/java/com/opensymphony/oscache/util/TestFastCronParser.java b/src/test/java/com/opensymphony/oscache/util/TestFastCronParser.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/util/TestFastCronParser.java
rename to src/test/java/com/opensymphony/oscache/util/TestFastCronParser.java
diff --git a/src/main/test/java/com/opensymphony/oscache/web/CheckDeployment.java b/src/test/java/com/opensymphony/oscache/web/CheckDeployment.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/web/CheckDeployment.java
rename to src/test/java/com/opensymphony/oscache/web/CheckDeployment.java
diff --git a/src/main/test/java/com/opensymphony/oscache/web/TestCompleteWeb.java b/src/test/java/com/opensymphony/oscache/web/TestCompleteWeb.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/web/TestCompleteWeb.java
rename to src/test/java/com/opensymphony/oscache/web/TestCompleteWeb.java
diff --git a/src/main/test/java/com/opensymphony/oscache/web/TestLoadCompleteWeb.java b/src/test/java/com/opensymphony/oscache/web/TestLoadCompleteWeb.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/web/TestLoadCompleteWeb.java
rename to src/test/java/com/opensymphony/oscache/web/TestLoadCompleteWeb.java
diff --git a/src/main/test/java/com/opensymphony/oscache/web/TestOscacheFilter.java b/src/test/java/com/opensymphony/oscache/web/TestOscacheFilter.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/web/TestOscacheFilter.java
rename to src/test/java/com/opensymphony/oscache/web/TestOscacheFilter.java
diff --git a/src/main/test/java/com/opensymphony/oscache/web/TestOscacheJsp.java b/src/test/java/com/opensymphony/oscache/web/TestOscacheJsp.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/web/TestOscacheJsp.java
rename to src/test/java/com/opensymphony/oscache/web/TestOscacheJsp.java
diff --git a/src/main/test/java/com/opensymphony/oscache/web/TestOscacheServlet.java b/src/test/java/com/opensymphony/oscache/web/TestOscacheServlet.java
similarity index 100%
rename from src/main/test/java/com/opensymphony/oscache/web/TestOscacheServlet.java
rename to src/test/java/com/opensymphony/oscache/web/TestOscacheServlet.java
diff --git a/src/main/test/java/oscacheDiskAndMemory.properties b/src/test/java/oscacheDiskAndMemory.properties
similarity index 100%
rename from src/main/test/java/oscacheDiskAndMemory.properties
rename to src/test/java/oscacheDiskAndMemory.properties
diff --git a/src/main/test/java/oscacheDiskOnly.properties b/src/test/java/oscacheDiskOnly.properties
similarity index 100%
rename from src/main/test/java/oscacheDiskOnly.properties
rename to src/test/java/oscacheDiskOnly.properties
diff --git a/src/main/test/java/oscacheDiskOnlyHash.properties b/src/test/java/oscacheDiskOnlyHash.properties
similarity index 100%
rename from src/main/test/java/oscacheDiskOnlyHash.properties
rename to src/test/java/oscacheDiskOnlyHash.properties
diff --git a/src/main/test/java/oscacheMemoryAndOverflowToDisk.properties b/src/test/java/oscacheMemoryAndOverflowToDisk.properties
similarity index 100%
rename from src/main/test/java/oscacheMemoryAndOverflowToDisk.properties
rename to src/test/java/oscacheMemoryAndOverflowToDisk.properties
diff --git a/src/main/test/java/oscacheMemoryOnly.properties b/src/test/java/oscacheMemoryOnly.properties
similarity index 100%
rename from src/main/test/java/oscacheMemoryOnly.properties
rename to src/test/java/oscacheMemoryOnly.properties