diff --git a/KeePassKit b/KeePassKit
index e838f882..ba0900e3 160000
--- a/KeePassKit
+++ b/KeePassKit
@@ -1 +1 @@
-Subproject commit e838f88255fc73eb5d25a67d95655f5c1b9454cc
+Subproject commit ba0900e35faef158a5cd1833c60e3d05db80610a
diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index bf73428b..22af0baa 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -1603,6 +1603,8 @@
 				4C5CD35217D15DBD000B7F38 /* NSString+Empty.m */,
 				4C5CD35317D15DBD000B7F38 /* NSString+Hexdata.h */,
 				4C5CD35417D15DBD000B7F38 /* NSString+Hexdata.m */,
+				4C89F51F182F9FDD0069C73C /* NSString+Commands.h */,
+				4C89F520182F9FDD0069C73C /* NSString+Commands.m */,
 				4C1842BE179B5BFD00E2F5BC /* NSData+CommonCrypto.h */,
 				4C1842BF179B5BFD00E2F5BC /* NSData+CommonCrypto.m */,
 				4C2724D51778FF1A00FD8456 /* NSUUID+KeePassKit.h */,
@@ -1615,8 +1617,6 @@
 				4C6366AB17AF1E0100AAF17D /* NSColor+KeePassKit.m */,
 				4C6C72C217C01E4200768849 /* NSMutableData+KeePassKit.h */,
 				4C6C72C317C01E4200768849 /* NSMutableData+KeePassKit.m */,
-				4C89F51F182F9FDD0069C73C /* NSString+Commands.h */,
-				4C89F520182F9FDD0069C73C /* NSString+Commands.m */,
 			);
 			path = Categories;
 			sourceTree = "<group>";
diff --git a/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme b/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
index da188ca5..9d6533b3 100644
--- a/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
+++ b/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
@@ -33,7 +33,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "4C45FB19178E09ED0010007D"
-               BuildableName = "MacPassTests.octest"
+               BuildableName = "MacPassTests.xctest"
                BlueprintName = "MacPassTests"
                ReferencedContainer = "container:MacPass.xcodeproj">
             </BuildableReference>
diff --git a/MacPassTests/KPKTestReference.m b/MacPassTests/KPKTestReference.m
index d68d5b23..e6d162b7 100644
--- a/MacPassTests/KPKTestReference.m
+++ b/MacPassTests/KPKTestReference.m
@@ -7,6 +7,7 @@
 //
 
 #import <XCTest/XCTest.h>
+#import "NSString+Commands.h"
 
 @interface KPKTestReference : XCTestCase
 
@@ -14,9 +15,21 @@
 
 @implementation KPKTestReference
 
-- (void)testExample
-{
+- (void)testCorrectReference {
+  NSString *reference = @"This is some nice stuff {REF:T@U:blubber} and another Reference {REF:U@I:2687345AASTA}";
+  [reference resolveReferencesWithTree:nil];
+}
 
+- (void)testWrongRefernceFormat {
+  XCTFail(@"Missing Test");
+}
+
+- (void)testUnknownReference {
+  XCTFail(@"Missing Test");
+}
+
+- (void)testMultipleMatchinRefernce {
+  XCTFail(@"Missing Test");
 }
 
 @end