Added and improved tests, added collectionQuery to CollectionLoader.

Change-Id: I6a10f8b7d0397493417e2e9914895317b46fae78
diff --git a/src/test/resources/test-default-config.xml b/src/test/resources/test-default-config.xml
index 48e97a8..19f7e89 100644
--- a/src/test/resources/test-default-config.xml
+++ b/src/test/resources/test-default-config.xml
@@ -23,8 +23,8 @@
 		<property name="ignoreResourceNotFound" value="true" />
 		<property name="locations">
 			<array>
-				<value>classpath:kustvakt.conf</value>
-				<value>file:./kustvakt.conf</value>
+				<value>classpath:kustvakt-test.conf</value>
+				<value>file:./kustvakt-test.conf</value>
 			</array>
 		</property>
 	</bean>