diff --git a/integration/main.go b/integration/main.go
index 770725e0a..25abdf56a 100644
--- a/integration/main.go
+++ b/integration/main.go
@@ -197,9 +197,15 @@ func Test() error {
 	record := os.Getenv("RECORD_EVENTS") != ""
 	updateSnapshots := record || os.Getenv("UPDATE_SNAPSHOTS") != ""
 
-	for _, test := range tests[0:1] {
+	selectedTestName := os.Args[1]
+
+	for _, test := range tests {
 		test := test
 
+		if selectedTestName != "" && test.Name != selectedTestName {
+			continue
+		}
+
 		speeds := getTestSpeeds(test.Speed, updateSnapshots)
 
 		for i, speed := range speeds {
diff --git a/test/integration/commit/expected/.git_keep/COMMIT_EDITMSG b/test/integration/commit/expected/.git_keep/COMMIT_EDITMSG
index fbe803e67..01f9a2aac 100644
--- a/test/integration/commit/expected/.git_keep/COMMIT_EDITMSG
+++ b/test/integration/commit/expected/.git_keep/COMMIT_EDITMSG
@@ -1 +1 @@
-my commit
+commit
diff --git a/test/integration/commit/expected/.git_keep/index b/test/integration/commit/expected/.git_keep/index
index cfbb26b72..e0b0f6831 100644
Binary files a/test/integration/commit/expected/.git_keep/index and b/test/integration/commit/expected/.git_keep/index differ
diff --git a/test/integration/commit/expected/.git_keep/logs/HEAD b/test/integration/commit/expected/.git_keep/logs/HEAD
index a61e86c36..01374ee2b 100644
--- a/test/integration/commit/expected/.git_keep/logs/HEAD
+++ b/test/integration/commit/expected/.git_keep/logs/HEAD
@@ -1,5 +1,5 @@
-0000000000000000000000000000000000000000 f4473317f8385f84b8054f3e9e9895870aa339bb CI <CI@example.com> 1601981250 +1100	commit (initial): myfile1
-f4473317f8385f84b8054f3e9e9895870aa339bb 60100545975af038486a0265a786b78c090faa4c CI <CI@example.com> 1601981250 +1100	commit: myfile2
-60100545975af038486a0265a786b78c090faa4c 7c8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 CI <CI@example.com> 1601981250 +1100	commit: myfile3
-7c8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 dcb4d7ccb176a17a6ddc2e1a402a28f055947393 CI <CI@example.com> 1601981250 +1100	commit: myfile4
-dcb4d7ccb176a17a6ddc2e1a402a28f055947393 459260de735f85c64517eef30e6a2d2236f3f920 CI <CI@example.com> 1601981254 +1100	commit: my commit
+0000000000000000000000000000000000000000 55bf9e2babc63fb5bae4b42c79fb1ddd1f4205fa CI <CI@example.com> 1617579407 +1000	commit (initial): myfile1
+55bf9e2babc63fb5bae4b42c79fb1ddd1f4205fa e68c1143545a09cac1db6e6f20db13b82b5dc43e CI <CI@example.com> 1617579407 +1000	commit: myfile2
+e68c1143545a09cac1db6e6f20db13b82b5dc43e ba001a041f64109b238f03550d6a21209bd5d4fc CI <CI@example.com> 1617579407 +1000	commit: myfile3
+ba001a041f64109b238f03550d6a21209bd5d4fc 6f31cc35ebabdf3fb71759e3d267677e712f737f CI <CI@example.com> 1617579407 +1000	commit: myfile4
+6f31cc35ebabdf3fb71759e3d267677e712f737f ecc083de4d216847c184c72a639743bba6520d88 CI <CI@example.com> 1617579409 +1000	commit: commit
diff --git a/test/integration/commit/expected/.git_keep/logs/refs/heads/master b/test/integration/commit/expected/.git_keep/logs/refs/heads/master
index a61e86c36..01374ee2b 100644
--- a/test/integration/commit/expected/.git_keep/logs/refs/heads/master
+++ b/test/integration/commit/expected/.git_keep/logs/refs/heads/master
@@ -1,5 +1,5 @@
-0000000000000000000000000000000000000000 f4473317f8385f84b8054f3e9e9895870aa339bb CI <CI@example.com> 1601981250 +1100	commit (initial): myfile1
-f4473317f8385f84b8054f3e9e9895870aa339bb 60100545975af038486a0265a786b78c090faa4c CI <CI@example.com> 1601981250 +1100	commit: myfile2
-60100545975af038486a0265a786b78c090faa4c 7c8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 CI <CI@example.com> 1601981250 +1100	commit: myfile3
-7c8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 dcb4d7ccb176a17a6ddc2e1a402a28f055947393 CI <CI@example.com> 1601981250 +1100	commit: myfile4
-dcb4d7ccb176a17a6ddc2e1a402a28f055947393 459260de735f85c64517eef30e6a2d2236f3f920 CI <CI@example.com> 1601981254 +1100	commit: my commit
+0000000000000000000000000000000000000000 55bf9e2babc63fb5bae4b42c79fb1ddd1f4205fa CI <CI@example.com> 1617579407 +1000	commit (initial): myfile1
+55bf9e2babc63fb5bae4b42c79fb1ddd1f4205fa e68c1143545a09cac1db6e6f20db13b82b5dc43e CI <CI@example.com> 1617579407 +1000	commit: myfile2
+e68c1143545a09cac1db6e6f20db13b82b5dc43e ba001a041f64109b238f03550d6a21209bd5d4fc CI <CI@example.com> 1617579407 +1000	commit: myfile3
+ba001a041f64109b238f03550d6a21209bd5d4fc 6f31cc35ebabdf3fb71759e3d267677e712f737f CI <CI@example.com> 1617579407 +1000	commit: myfile4
+6f31cc35ebabdf3fb71759e3d267677e712f737f ecc083de4d216847c184c72a639743bba6520d88 CI <CI@example.com> 1617579409 +1000	commit: commit
diff --git a/test/integration/commit/expected/.git_keep/objects/45/9260de735f85c64517eef30e6a2d2236f3f920 b/test/integration/commit/expected/.git_keep/objects/45/9260de735f85c64517eef30e6a2d2236f3f920
deleted file mode 100644
index 906c7e190..000000000
Binary files a/test/integration/commit/expected/.git_keep/objects/45/9260de735f85c64517eef30e6a2d2236f3f920 and /dev/null differ
diff --git a/test/integration/commit/expected/.git_keep/objects/55/bf9e2babc63fb5bae4b42c79fb1ddd1f4205fa b/test/integration/commit/expected/.git_keep/objects/55/bf9e2babc63fb5bae4b42c79fb1ddd1f4205fa
new file mode 100644
index 000000000..e169a11e3
--- /dev/null
+++ b/test/integration/commit/expected/.git_keep/objects/55/bf9e2babc63fb5bae4b42c79fb1ddd1f4205fa
@@ -0,0 +1,2 @@
+x
��A
+�0@Ѯs��ʌ'J\y��L���")���#t�y�S5[˥���*�`��2�R���T</|��%��s��^u�i��4��������=��|�FWBDw�s��O��W�M�3�,�
\ No newline at end of file
diff --git a/test/integration/commit/expected/.git_keep/objects/60/100545975af038486a0265a786b78c090faa4c b/test/integration/commit/expected/.git_keep/objects/60/100545975af038486a0265a786b78c090faa4c
deleted file mode 100644
index b6365c94e..000000000
--- a/test/integration/commit/expected/.git_keep/objects/60/100545975af038486a0265a786b78c090faa4c
+++ /dev/null
@@ -1,2 +0,0 @@
-x
��M
-�0@a�9E���d�7 "t�c$��-%������[�imm�ٟ�.bK"�%��<�(G��Z#��b�����c4[��խz��0i�4��!x%a��!'(��k5���n��^��.�Ҷ�\���,F@���3"�9�1��On�W��8�v�9w
\ No newline at end of file
diff --git a/test/integration/commit/expected/.git_keep/objects/6f/31cc35ebabdf3fb71759e3d267677e712f737f b/test/integration/commit/expected/.git_keep/objects/6f/31cc35ebabdf3fb71759e3d267677e712f737f
new file mode 100644
index 000000000..c11a558e0
Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/6f/31cc35ebabdf3fb71759e3d267677e712f737f differ
diff --git a/test/integration/commit/expected/.git_keep/objects/7c/8c3a30f773b8d25cf9b5f5eccfe1b4cf823069 b/test/integration/commit/expected/.git_keep/objects/7c/8c3a30f773b8d25cf9b5f5eccfe1b4cf823069
deleted file mode 100644
index 7359cf0a9..000000000
--- a/test/integration/commit/expected/.git_keep/objects/7c/8c3a30f773b8d25cf9b5f5eccfe1b4cf823069
+++ /dev/null
@@ -1,2 +0,0 @@
-x
��M
-�0F]��2��M@D�ǘN3X0��z{sW<�O�Z�f1�S;J�Ì�	E\�;��*/�@hv8H�+��|�W� ��S`G�"�'�s"�����=�Î���ӽ|���r���,�H&�3��鴟j�O�ԯ������9�
\ No newline at end of file
diff --git a/test/integration/commit/expected/.git_keep/objects/ba/001a041f64109b238f03550d6a21209bd5d4fc b/test/integration/commit/expected/.git_keep/objects/ba/001a041f64109b238f03550d6a21209bd5d4fc
new file mode 100644
index 000000000..e71124dfe
Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/ba/001a041f64109b238f03550d6a21209bd5d4fc differ
diff --git a/test/integration/commit/expected/.git_keep/objects/dc/b4d7ccb176a17a6ddc2e1a402a28f055947393 b/test/integration/commit/expected/.git_keep/objects/dc/b4d7ccb176a17a6ddc2e1a402a28f055947393
deleted file mode 100644
index e288012fb..000000000
Binary files a/test/integration/commit/expected/.git_keep/objects/dc/b4d7ccb176a17a6ddc2e1a402a28f055947393 and /dev/null differ
diff --git a/test/integration/commit/expected/.git_keep/objects/e6/8c1143545a09cac1db6e6f20db13b82b5dc43e b/test/integration/commit/expected/.git_keep/objects/e6/8c1143545a09cac1db6e6f20db13b82b5dc43e
new file mode 100644
index 000000000..e674fb807
Binary files /dev/null and b/test/integration/commit/expected/.git_keep/objects/e6/8c1143545a09cac1db6e6f20db13b82b5dc43e differ
diff --git a/test/integration/commit/expected/.git_keep/objects/ec/c083de4d216847c184c72a639743bba6520d88 b/test/integration/commit/expected/.git_keep/objects/ec/c083de4d216847c184c72a639743bba6520d88
new file mode 100644
index 000000000..39146c9f3
--- /dev/null
+++ b/test/integration/commit/expected/.git_keep/objects/ec/c083de4d216847c184c72a639743bba6520d88
@@ -0,0 +1,4 @@
+x
��A
+1�a�=E��4M�� "�j���)
+��
+�.<������kk���wU +���k�L�O�:Q�5�+��O��l��C��9ӤIR�4������U&�F����0/p���~�mO=�]
��p�6���f�#�����e);a
\ No newline at end of file
diff --git a/test/integration/commit/expected/.git_keep/objects/f4/473317f8385f84b8054f3e9e9895870aa339bb b/test/integration/commit/expected/.git_keep/objects/f4/473317f8385f84b8054f3e9e9895870aa339bb
deleted file mode 100644
index 156705abb..000000000
Binary files a/test/integration/commit/expected/.git_keep/objects/f4/473317f8385f84b8054f3e9e9895870aa339bb and /dev/null differ
diff --git a/test/integration/commit/expected/.git_keep/refs/heads/master b/test/integration/commit/expected/.git_keep/refs/heads/master
index 0ccfd5d63..3730bab88 100644
--- a/test/integration/commit/expected/.git_keep/refs/heads/master
+++ b/test/integration/commit/expected/.git_keep/refs/heads/master
@@ -1 +1 @@
-459260de735f85c64517eef30e6a2d2236f3f920
+ecc083de4d216847c184c72a639743bba6520d88
diff --git a/test/integration/commit/recording.json b/test/integration/commit/recording.json
index d362b0271..78df06751 100644
--- a/test/integration/commit/recording.json
+++ b/test/integration/commit/recording.json
@@ -1,226 +1 @@
-[
-  {
-    "Timestamp": 41,
-    "Event": {
-      "Type": 1,
-      "Mod": 0,
-      "Key": 0,
-      "Ch": 0,
-      "Width": 0,
-      "Height": 0,
-      "Err": null,
-      "MouseX": 0,
-      "MouseY": 0,
-      "N": 0,
-      "Bytes": null
-    }
-  },
-  {
-    "Timestamp": 1042,
-    "Event": {
-      "Type": 0,
-      "Mod": 0,
-      "Key": 32,
-      "Ch": 0,
-      "Width": 0,
-      "Height": 0,
-      "Err": null,
-      "MouseX": 0,
-      "MouseY": 0,
-      "N": 1,
-      "Bytes": "IA=="
-    }
-  },
-  {
-    "Timestamp": 1602,
-    "Event": {
-      "Type": 0,
-      "Mod": 0,
-      "Key": 0,
-      "Ch": 99,
-      "Width": 0,
-      "Height": 0,
-      "Err": null,
-      "MouseX": 0,
-      "MouseY": 0,
-      "N": 1,
-      "Bytes": "Yw=="
-    }
-  },
-  {
-    "Timestamp": 2010,
-    "Event": {
-      "Type": 0,
-      "Mod": 0,
-      "Key": 0,
-      "Ch": 109,
-      "Width": 0,
-      "Height": 0,
-      "Err": null,
-      "MouseX": 0,
-      "MouseY": 0,
-      "N": 1,
-      "Bytes": "bQ=="
-    }
-  },
-  {
-    "Timestamp": 2170,
-    "Event": {
-      "Type": 0,
-      "Mod": 0,
-      "Key": 0,
-      "Ch": 121,
-      "Width": 0,
-      "Height": 0,
-      "Err": null,
-      "MouseX": 0,
-      "MouseY": 0,
-      "N": 1,
-      "Bytes": "eQ=="
-    }
-  },
-  {
-    "Timestamp": 2234,
-    "Event": {
-      "Type": 0,
-      "Mod": 0,
-      "Key": 32,
-      "Ch": 0,
-      "Width": 0,
-      "Height": 0,
-      "Err": null,
-      "MouseX": 0,
-      "MouseY": 0,
-      "N": 1,
-      "Bytes": "IA=="
-    }
-  },
-  {
-    "Timestamp": 2354,
-    "Event": {
-      "Type": 0,
-      "Mod": 0,
-      "Key": 0,
-      "Ch": 99,
-      "Width": 0,
-      "Height": 0,
-      "Err": null,
-      "MouseX": 0,
-      "MouseY": 0,
-      "N": 1,
-      "Bytes": "Yw=="
-    }
-  },
-  {
-    "Timestamp": 2410,
-    "Event": {
-      "Type": 0,
-      "Mod": 0,
-      "Key": 0,
-      "Ch": 111,
-      "Width": 0,
-      "Height": 0,
-      "Err": null,
-      "MouseX": 0,
-      "MouseY": 0,
-      "N": 1,
-      "Bytes": "bw=="
-    }
-  },
-  {
-    "Timestamp": 2578,
-    "Event": {
-      "Type": 0,
-      "Mod": 0,
-      "Key": 0,
-      "Ch": 109,
-      "Width": 0,
-      "Height": 0,
-      "Err": null,
-      "MouseX": 0,
-      "MouseY": 0,
-      "N": 1,
-      "Bytes": "bQ=="
-    }
-  },
-  {
-    "Timestamp": 2690,
-    "Event": {
-      "Type": 0,
-      "Mod": 0,
-      "Key": 0,
-      "Ch": 109,
-      "Width": 0,
-      "Height": 0,
-      "Err": null,
-      "MouseX": 0,
-      "MouseY": 0,
-      "N": 1,
-      "Bytes": "bQ=="
-    }
-  },
-  {
-    "Timestamp": 2730,
-    "Event": {
-      "Type": 0,
-      "Mod": 0,
-      "Key": 0,
-      "Ch": 105,
-      "Width": 0,
-      "Height": 0,
-      "Err": null,
-      "MouseX": 0,
-      "MouseY": 0,
-      "N": 1,
-      "Bytes": "aQ=="
-    }
-  },
-  {
-    "Timestamp": 2850,
-    "Event": {
-      "Type": 0,
-      "Mod": 0,
-      "Key": 0,
-      "Ch": 116,
-      "Width": 0,
-      "Height": 0,
-      "Err": null,
-      "MouseX": 0,
-      "MouseY": 0,
-      "N": 1,
-      "Bytes": "dA=="
-    }
-  },
-  {
-    "Timestamp": 2954,
-    "Event": {
-      "Type": 0,
-      "Mod": 0,
-      "Key": 13,
-      "Ch": 0,
-      "Width": 0,
-      "Height": 0,
-      "Err": null,
-      "MouseX": 0,
-      "MouseY": 0,
-      "N": 1,
-      "Bytes": "DQ=="
-    }
-  },
-  {
-    "Timestamp": 3625,
-    "Event": {
-      "Type": 0,
-      "Mod": 0,
-      "Key": 0,
-      "Ch": 113,
-      "Width": 0,
-      "Height": 0,
-      "Err": null,
-      "MouseX": 0,
-      "MouseY": 0,
-      "N": 1,
-      "Bytes": "cQ=="
-    }
-  }
-]
+{"KeyEvents":[{"Timestamp":9223372036854,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9223372036854,"Mod":0,"Key":256,"Ch":99},{"Timestamp":9223372036854,"Mod":0,"Key":256,"Ch":99},{"Timestamp":9223372036854,"Mod":0,"Key":256,"Ch":111},{"Timestamp":9223372036854,"Mod":0,"Key":256,"Ch":109},{"Timestamp":9223372036854,"Mod":0,"Key":256,"Ch":109},{"Timestamp":9223372036854,"Mod":0,"Key":256,"Ch":105},{"Timestamp":9223372036854,"Mod":0,"Key":256,"Ch":116},{"Timestamp":9223372036854,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9223372036854,"Mod":0,"Key":256,"Ch":113}]}
\ No newline at end of file