@@ -10,53 +10,57 @@
 	${PROG_NOINST}.rpx	\
 	testfile_bin.m		\
 	testfile_ini.m
 
 PROG_NOINST = tests${PROG_SUFFIX}
-SRCS = ${OF_BLOCK_TESTS_M}		\
-       ForwardingTests.m		\
-       OFArrayTests.m			\
-       OFCharacterSetTests.m		\
-       OFColorTests.m			\
-       OFConcreteArrayTests.m		\
-       OFConcreteMutableArrayTests.m	\
-       OFConcreteMutableSetTests.m	\
-       OFConcreteSetTests.m		\
-       OFCryptographicHashTests.m	\
-       OFDateTests.m			\
-       OFHMACTests.m			\
-       OFINIFileTests.m			\
-       OFIRITests.m			\
-       OFInvocationTests.m		\
-       OFJSONTests.m			\
-       OFListTests.m			\
-       OFLocaleTests.m			\
-       OFMatrix4x4Tests.m		\
-       OFMethodSignatureTests.m		\
-       OFMutableArrayTests.m		\
-       OFMutableSetTests.m		\
-       OFMutableStringTests.m		\
-       OFMutableUTF8StringTests.m	\
-       OFNotificationCenterTests.m	\
-       OFNumberTests.m			\
-       OFObjectTests.m			\
-       OFPBKDF2Tests.m			\
-       OFPropertyListTests.m		\
-       OFScryptTests.m			\
-       OFSetTests.m			\
-       OFStringTests.m			\
-       OFSystemInfoTests.m		\
-       OFUTF8StringTests.m		\
-       OFXMLElementBuilderTests.m	\
-       ${RUNTIME_ARC_TESTS_M}		\
-       RuntimeTests.m			\
-       ${USE_SRCS_PLUGINS}		\
-       ${USE_SRCS_SOCKETS}		\
-       ${USE_SRCS_SUBPROCESSES}		\
-       ${USE_SRCS_THREADS}		\
-       ${USE_SRCS_WINDOWS}		\
-       testfile_bin.m			\
+SRCS = ${OF_BLOCK_TESTS_M}			\
+       ForwardingTests.m			\
+       OFArrayTests.m				\
+       OFCharacterSetTests.m			\
+       OFColorTests.m				\
+       OFConcreteArrayTests.m			\
+       OFConcreteDictionaryTests.m		\
+       OFConcreteMutableArrayTests.m		\
+       OFConcreteMutableDictionaryTests.m	\
+       OFConcreteMutableSetTests.m		\
+       OFConcreteSetTests.m			\
+       OFCryptographicHashTests.m		\
+       OFDateTests.m				\
+       OFDictionaryTests.m			\
+       OFHMACTests.m				\
+       OFINIFileTests.m				\
+       OFIRITests.m				\
+       OFInvocationTests.m			\
+       OFJSONTests.m				\
+       OFListTests.m				\
+       OFLocaleTests.m				\
+       OFMatrix4x4Tests.m			\
+       OFMethodSignatureTests.m			\
+       OFMutableArrayTests.m			\
+       OFMutableDictionaryTests.m		\
+       OFMutableSetTests.m			\
+       OFMutableStringTests.m			\
+       OFMutableUTF8StringTests.m		\
+       OFNotificationCenterTests.m		\
+       OFNumberTests.m				\
+       OFObjectTests.m				\
+       OFPBKDF2Tests.m				\
+       OFPropertyListTests.m			\
+       OFScryptTests.m				\
+       OFSetTests.m				\
+       OFStringTests.m				\
+       OFSystemInfoTests.m			\
+       OFUTF8StringTests.m			\
+       OFXMLElementBuilderTests.m		\
+       ${RUNTIME_ARC_TESTS_M}			\
+       RuntimeTests.m				\
+       ${USE_SRCS_PLUGINS}			\
+       ${USE_SRCS_SOCKETS}			\
+       ${USE_SRCS_SUBPROCESSES}			\
+       ${USE_SRCS_THREADS}			\
+       ${USE_SRCS_WINDOWS}			\
+       testfile_bin.m				\
        testfile_ini.m
 SRCS_PLUGINS = OFPluginTests.m
 SRCS_SOCKETS = OFDNSResolverTests.m		\
 	       ${OF_HTTP_CLIENT_TESTS_M}	\
 	       OFHTTPCookieManagerTests.m	\