diff --git a/MacPassTests/KPKTestLegacyWriting.h b/MacPassTests/KPKTestLegacyWriting.h
index 5e18fece..e3d35ae1 100644
--- a/MacPassTests/KPKTestLegacyWriting.h
+++ b/MacPassTests/KPKTestLegacyWriting.h
@@ -9,9 +9,6 @@
 #import <SenTestingKit/SenTestingKit.h>
 @class KPKPassword;
 
-@interface KPKTestLegacyWriting : SenTestCase {
-  NSData *_data;
-  KPKPassword *_password;
-}
+@interface KPKTestLegacyWriting : SenTestCase
 
 @end
diff --git a/MacPassTests/KPKTestLegacyWriting.m b/MacPassTests/KPKTestLegacyWriting.m
index 950e4275..f62f04ef 100644
--- a/MacPassTests/KPKTestLegacyWriting.m
+++ b/MacPassTests/KPKTestLegacyWriting.m
@@ -8,28 +8,34 @@
 
 #import "KPKTestLegacyWriting.h"
 
-
 #import "KPKPassword.h"
 #import "KPKTree+Serializing.h"
 
 @implementation KPKTestLegacyWriting
 
-- (void)setUp {
-  NSBundle *myBundle = [NSBundle bundleForClass:[self class]];
-  NSURL *url = [myBundle URLForResource:@"Test_Password_1234" withExtension:@"kdb"];
-  _data = [NSData dataWithContentsOfURL:url];
-  _password = [[KPKPassword alloc] initWithPassword:@"1234" key:nil];
-}
-
-- (void)tearDown {
-  _data = nil;
-  _password = nil;
-}
-
 - (void)testWriting {
-  NSError *error = nil;
-  KPKTree *tree = [[KPKTree alloc] initWithData:_data password:_password error:&error];
-  NSData *data = [tree encryptWithPassword:_password forVersion:KPKLegacyVersion error:&error];
+  NSError __autoreleasing *error = nil;
+  NSURL *dbUrl = [self _urlForFile:@"CustomIcon_Password_1234" extension:@"kdbx"];
+  KPKPassword *password = [[KPKPassword alloc] initWithPassword:@"1234" key:nil];
+  KPKTree *tree = [[KPKTree alloc] initWithContentsOfUrl:dbUrl password:password error:&error];
+  STAssertNotNil(tree, @"Tree should be created");
+  error = nil;
+  NSData *data = [tree encryptWithPassword:password forVersion:KPKLegacyVersion error:&error];
+  STAssertNotNil(data, @"Serialized Data shoudl be created");
+  NSString *tempFile = [NSTemporaryDirectory() stringByAppendingString:@"CustomIcon_Password_1234.kdb"];
+  NSLog(@"Saved to %@", tempFile);
+  [data writeToFile:tempFile atomically:YES];
+  KPKTree *loadTree = [[KPKTree alloc] initWithData:data password:password error:&error];
+  STAssertNotNil(loadTree, @"Tree should be loadable from kdb file data");
+}
+
+- (NSData *)_dataForFile:(NSString *)name extension:(NSString *)extension {
+  NSURL *url = [self _urlForFile:name extension:extension];
+  return [NSData dataWithContentsOfURL:url];
+}
+
+- (NSURL *)_urlForFile:(NSString *)file extension:(NSString *)extension {
+  return [[NSBundle bundleForClass:[self class]] URLForResource:file withExtension:extension];
 }
 
 
diff --git a/MacPassTests/KPKTestXmlWriting.m b/MacPassTests/KPKTestXmlWriting.m
index 4f3710e5..3d844d7a 100644
--- a/MacPassTests/KPKTestXmlWriting.m
+++ b/MacPassTests/KPKTestXmlWriting.m
@@ -28,7 +28,6 @@
   NSURL *url = [NSURL fileURLWithPath:tempFile];
   KPKTree *reloadedTree = [[KPKTree alloc] initWithContentsOfUrl:url password:password error:&error];
   STAssertNotNil(reloadedTree, @"Reloaded tree should not be nil");
-  re
 }
 
 - (NSData *)_loadTestDataBase:(NSString *)name extension:(NSString *)extension {