diff --git a/KeePassKit b/KeePassKit
index 1fa5c5d7..a1b1ef3c 160000
--- a/KeePassKit
+++ b/KeePassKit
@@ -1 +1 @@
-Subproject commit 1fa5c5d743be64c7793a1224d239b20a1afdaed5
+Subproject commit a1b1ef3cb95738587916a43f63fbc0f03508fae9
diff --git a/MacPassTests/KPKTestModificationDates.m b/MacPassTests/KPKTestModificationDates.m
index ff621870..9d3731f6 100644
--- a/MacPassTests/KPKTestModificationDates.m
+++ b/MacPassTests/KPKTestModificationDates.m
@@ -36,8 +36,21 @@
   [super tearDown];
 }
 
-- (void)testGroupModificationDate {
+- (void)testEnableDisableModificationRecording {
+  XCTAssertTrue(self.group.updateTiming, @"updateTiming is enabled for newly created groups!");
+  XCTAssertTrue(self.entry.updateTiming, @"updateTiming is enabled for newly created entries!");
+  self.group.updateTiming = NO;
+  self.entry.updateTiming = NO;
+  XCTAssertFalse(self.group.updateTiming, @"updateTiming is disabled!");
+  XCTAssertFalse(self.entry.updateTiming, @"updateTiming is disabled!");
+  self.group.updateTiming = YES;
+  self.entry.updateTiming = YES;
+  XCTAssertTrue(self.group.updateTiming, @"updateTiming is enabled!");
+  XCTAssertTrue(self.entry.updateTiming, @"updateTiming is enabled!");
+}
 
+- (void)testGroupModificationDate {
+  XCTFail(@"Missing Test");
 }
 
 - (void)testEntryModifiationDate {
diff --git a/MacPassTests/KPKTestNSCoding.m b/MacPassTests/KPKTestNSCoding.m
index 152c7abe..d983f761 100644
--- a/MacPassTests/KPKTestNSCoding.m
+++ b/MacPassTests/KPKTestNSCoding.m
@@ -9,14 +9,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "KPKAttribute.h"
-#import "KPKBinary.h"
-#import "KPKEntry.h"
-#import "KPKGroup.h"
-#import "KPKIcon.h"
-#import "KPKXmlElements.h"
-
-#import "NSData+Random.h"
+#import "KeePassKit.h"
 
 @interface KPKTestNSCoding : XCTestCase
 
diff --git a/MacPassTests/KPKTestNSCopying.m b/MacPassTests/KPKTestNSCopying.m
index 7b8adb3f..2e1802fa 100644
--- a/MacPassTests/KPKTestNSCopying.m
+++ b/MacPassTests/KPKTestNSCopying.m
@@ -7,12 +7,7 @@
 //
 
 #import <XCTest/XCTest.h>
-#import "KPKIconTypes.h"
-#import "KPKGroup.h"
-#import "KPKEntry.h"
-#import "KPKAttribute.h"
-#import "KPKBinary.h"
-#import "KPKXmlElements.h"
+#import "KeePassKit.h"
 
 @interface KPKTestNSCopying : XCTestCase