Index: src/test/OTAppDelegate.m
==================================================================
--- src/test/OTAppDelegate.m
+++ src/test/OTAppDelegate.m
@@ -493,21 +493,22 @@
 					     description: description];
 
 				failed = true;
 			}
 
-			if (!failed && !skipped) {
+			if (failed)
+				numFailed++;
+			else if (skipped)
+				numSkipped++;
+			else {
 				[self printStatusForTest: test.pointerValue
 						 inClass: class
 						  status: StatusOk
 					     description: nil];
 
 				numSucceeded++;
-			} else if (failed)
-				numFailed++;
-			else if (skipped)
-				numSkipped++;
+			}
 
 			objc_autoreleasePoolPop(pool);
 		}
 
 		summary = [class summary];

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -1,8 +1,11 @@
 include ../extra.mk
 
-SUBDIRS = ${TESTPLUGIN} ${SUBPROCESS} ${OBJC_SYNC} terminal
+SUBDIRS = ${TESTPLUGIN}	\
+	  ${SUBPROCESS}	\
+	  ${OBJC_SYNC}	\
+	  terminal
 
 CLEAN = EBOOT.PBP		\
 	boot.dol		\
 	${PROG_NOINST}.arm9	\
 	${PROG_NOINST}.nds	\
@@ -12,13 +15,13 @@
 	testfile_ini.m
 DISTCLEAN = Info.plist
 
 PROG_NOINST = tests${PROG_SUFFIX}
 STATIC_LIB_NOINST = ${TESTS_STATIC_LIB}
-SRCS = ${OF_BLOCK_TESTS_M}			\
-       ForwardingTests.m			\
+SRCS = ForwardingTests.m			\
        OFArrayTests.m				\
+       ${OF_BLOCK_TESTS_M}			\
        OFCharacterSetTests.m			\
        OFColorTests.m				\
        OFConcreteArrayTests.m			\
        OFConcreteDictionaryTests.m		\
        OFConcreteMutableArrayTests.m		\
@@ -76,13 +79,13 @@
 	       OFHTTPCookieTests.m		\
 	       OFKernelEventObserverTests.m	\
 	       OFSocketTests.m			\
 	       OFTCPSocketTests.m		\
 	       OFUDPSocketTests.m		\
+	       ${USE_SRCS_APPLETALK}		\
 	       ${USE_SRCS_IPX}			\
-	       ${USE_SRCS_UNIX_SOCKETS}		\
-	       ${USE_SRCS_APPLETALK}
+	       ${USE_SRCS_UNIX_SOCKETS}
 SRCS_APPLETALK = OFDDPSocketTests.m
 SRCS_IPX = OFIPXSocketTests.m		\
 	   OFSPXSocketTests.m		\
 	   OFSPXStreamSocketTests.m
 SRCS_UNIX_SOCKETS = OFUNIXDatagramSocketTests.m	\

Index: tests/OFPBKDF2Tests.m
==================================================================
--- tests/OFPBKDF2Tests.m
+++ tests/OFPBKDF2Tests.m
@@ -44,11 +44,11 @@
 
 /* Test vectors from RFC 6070 */
 
 - (void)testRFC6070TestVector1
 {
-	unsigned char key[25];
+	unsigned char key[20];
 
 	OFPBKDF2((OFPBKDF2Parameters){
 		.HMAC                  = _HMAC,
 		.iterations            = 1,
 		.salt                  = (unsigned char *)"salt",
@@ -64,11 +64,11 @@
 	    "\x24\xAF\x60\x12\x06\x2F\xE0\x37\xA6", 20), 0);
 }
 
 - (void)testRFC6070TestVector2
 {
-	unsigned char key[25];
+	unsigned char key[20];
 
 	OFPBKDF2((OFPBKDF2Parameters){
 		.HMAC                  = _HMAC,
 		.iterations            = 2,
 		.salt                  = (unsigned char *)"salt",
@@ -84,11 +84,11 @@
 	    "\x2A\xCE\x1D\x41\xF0\xD8\xDE\x89\x57", 20), 0);
 }
 
 - (void)testRFC6070TestVector3
 {
-	unsigned char key[25];
+	unsigned char key[20];
 
 	OFPBKDF2((OFPBKDF2Parameters){
 		.HMAC                  = _HMAC,
 		.iterations            = 4096,
 		.salt                  = (unsigned char *)"salt",
@@ -106,11 +106,11 @@
 
 #if 0
 /* This test takes too long, even on a fast machine. */
 - (void)testRFC6070TestVector4
 {
-	unsigned char key[25];
+	unsigned char key[20];
 
 	OFPBKDF2((OFPBKDF2Parameters){
 		.HMAC                  = _HMAC,
 		.iterations            = 16777216,
 		.salt                  = (unsigned char *)"salt",
@@ -148,11 +148,11 @@
 	    "\x36\x62\xC0\xE4\x4A\x8B\x29\x1A\x96\x4C\xF2\xF0\x70\x38", 25), 0);
 }
 
 - (void)testRFC6070TestVector6
 {
-	unsigned char key[25];
+	unsigned char key[16];
 
 	OFPBKDF2((OFPBKDF2Parameters){
 		.HMAC                  = _HMAC,
 		.iterations            = 4096,
 		.salt                  = (unsigned char *)"sa\0lt",