@@ -42,11 +42,13 @@
 	    @";comment" NL
 	    @"new=new" NL
 	    NL
 	    @"[foobar]" NL
 	    @";foobarcomment" NL
-	    @"qux= asd" NL
+	    @"qux=\" asd\"" NL
+	    @"quxquxqux=\"hello\\\"world\"" NL
+	    @"qux2=\"\\f\"" NL
 	    NL
 	    @"[types]" NL
 	    @"integer=16" NL
 	    @"bool=false" NL
 	    @"float=0.25" NL
@@ -61,11 +63,15 @@
 	    (category = [file categoryForName: @"tests"]))
 
 	module = @"OFINICategory";
 
 	TEST(@"-[stringForKey:]",
-	    [[category stringForKey: @"foo"] isEqual: @"bar"])
+	    [[category stringForKey: @"foo"] isEqual: @"bar"] &&
+	    (category = [file categoryForName: @"foobar"]) &&
+	    [[category stringForKey: @"quxquxqux"] isEqual: @"hello\"world"])
+
+	category = [file categoryForName: @"tests"];
 
 	TEST(@"-[setString:forKey:]",
 	    R([category setString: @"baz"
 			   forKey: @"foo"]) &&
 	    R([category setString: @"new"
@@ -102,11 +108,11 @@
 						     forKey: @"double"]))
 
 	category = [file categoryForName: @"foobar"];
 
 	TEST(@"-[removeValueForKey:]",
-	    R([category removeValueForKey: @"quxqux"]))
+	    R([category removeValueForKey: @"quxqux "]))
 
 	module = @"OFINIFile";
 
 	/* FIXME: Find a way to write files on Nintendo DS */
 #ifndef OF_NINTENDO_DS