diff --git a/Strings.xcodeproj/project.pbxproj b/Strings.xcodeproj/project.pbxproj
index 2a0bda9..a200ce0 100644
--- a/Strings.xcodeproj/project.pbxproj
+++ b/Strings.xcodeproj/project.pbxproj
@@ -46,6 +46,9 @@
 		1371BBDE177DBDD9008EB467 /* ZFLangFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 1371BBDD177DBDD9008EB467 /* ZFLangFile.m */; };
 		137CBEA6177F2556003C472E /* ZFTranslationLine.m in Sources */ = {isa = PBXBuildFile; fileRef = 137CBEA5177F2556003C472E /* ZFTranslationLine.m */; };
 		137CBEA7177F2B7F003C472E /* ZFTranslationLine.m in Sources */ = {isa = PBXBuildFile; fileRef = 137CBEA5177F2556003C472E /* ZFTranslationLine.m */; };
+		137CBEA8177F581E003C472E /* ZFLangFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 1371BBDD177DBDD9008EB467 /* ZFLangFile.m */; };
+		137CBEA9177F5820003C472E /* ZFTranslationLine.m in Sources */ = {isa = PBXBuildFile; fileRef = 137CBEA5177F2556003C472E /* ZFTranslationLine.m */; };
+		137CBEAA177F5828003C472E /* ZFStringScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = 134E990B1779A80700D7D54B /* ZFStringScanner.m */; };
 		13B17AED177AFB6000C0473E /* ZFTranslationFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B17AEC177AFB6000C0473E /* ZFTranslationFile.m */; };
 		13B17AEE177AFE2800C0473E /* ZFTranslationFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B17AEC177AFB6000C0473E /* ZFTranslationFile.m */; };
 		13B17AEF177AFE2800C0473E /* ZFTranslationFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B17AEC177AFB6000C0473E /* ZFTranslationFile.m */; };
@@ -509,6 +512,9 @@
 				134E992C1779E6B300D7D54B /* ZFStringsConverter.m in Sources */,
 				13B17AEF177AFE2800C0473E /* ZFTranslationFile.m in Sources */,
 				13B17AF4177B052100C0473E /* ZFUtils.m in Sources */,
+				137CBEA8177F581E003C472E /* ZFLangFile.m in Sources */,
+				137CBEA9177F5820003C472E /* ZFTranslationLine.m in Sources */,
+				137CBEAA177F5828003C472E /* ZFStringScanner.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/StringsTests/StringsTests-Prefix.pch b/StringsTests/StringsTests-Prefix.pch
index 58fb205..e026177 100644
--- a/StringsTests/StringsTests-Prefix.pch
+++ b/StringsTests/StringsTests-Prefix.pch
@@ -4,4 +4,6 @@
 
 #ifdef __OBJC__
     #import <Cocoa/Cocoa.h>
+    #import "Config.h"
+    #import "ZFUtils.h"
 #endif
diff --git a/StringsTests/ZFStringConverterTests.m b/StringsTests/ZFStringConverterTests.m
index 00eb5af..4b1fc6e 100644
--- a/StringsTests/ZFStringConverterTests.m
+++ b/StringsTests/ZFStringConverterTests.m
@@ -44,44 +44,21 @@ - (void)testFormatConverter {
     
 }
 
-- (void)testCopareConversions {
+- (void)testCompareConversions {
     
     NSURL *stringsURL = [[NSBundle mainBundle] URLForResource:@"Test" withExtension:@"txt"];
     NSURL *tempURL = [NSURL URLWithString:NSTemporaryDirectory()];
     NSURL *xmlURL = [tempURL URLByAppendingPathComponent:@"testXML.xml"];
     
     
-    NSDictionary *stringsTranslations = [self.converter translationsForStringsAtURL:stringsURL];
+    NSArray *stringsTranslations = [self.converter translationsForStringsAtURL:stringsURL];
     
     STAssertTrue((stringsTranslations && stringsTranslations.count > 0), @"XML result is empty");
     
-    NSString *xmlString = [self.converter xmlStringFromDictionary:stringsTranslations];
+    NSString *xmlString = [self.converter xmlStringFromTranslations:stringsTranslations];
     
     STAssertTrue((xmlString && xmlString.length > 0), @"XML result is empty");
     
-    NSError *error = nil;
-    [xmlString writeToURL:xmlURL atomically:YES encoding:NSUTF8StringEncoding error:&error];
-    
-    NSDictionary *xmlTranslations = [self.converter translationsForXMLAtURL:xmlURL];
-    
-    NSMutableArray *allKeys = [NSMutableArray arrayWithArray:[stringsTranslation allKeys]];
-    
-    [xmlTranslations enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, BOOL *stop) {
-        [allKeys removeObject:key];
-        NSString *stringsValue = [stringsTranslations objectForKey:key];
-        
-        STAssertFalse((stringsValue == nil), @"Key %@ not present", key);
-        
-        if ([stringsValue rangeOfString:@"%"].location == NSNotFound) STAssertTrue([stringsValue isEqualToString:value], @"Key %@ didn't properly convert");
-        else {
-            stringsValue = [self.converter convertFormatForString:stringsValue isIOS:YES];
-            STAssertTrue([stringsValue isEqualToString:value], @"Key %@ didn't properly convert formats");
-        }
-        
-    }];
-    
-    STAssertTrue((allKeys.count == 0), @"Some keys have not been converted: %@", [allKeys componentsJoinedByString:@", "]);
-    
 }
 
 @end