diff --git a/OSBindings/Mac/Clock SignalTests/6502TimingTests.swift b/OSBindings/Mac/Clock SignalTests/6502TimingTests.swift
index 98031b971..45c520a61 100644
--- a/OSBindings/Mac/Clock SignalTests/6502TimingTests.swift	
+++ b/OSBindings/Mac/Clock SignalTests/6502TimingTests.swift	
@@ -34,6 +34,7 @@ class MOS6502TimingTests: XCTestCase, CSTestMachineTrapHandler {
 			0xbd, 0x00, 0x00,	// [4] LDA $0000, x (no wrap)
 			0xbd, 0x02, 0x00,	// [5] LDA $0002, x (wrap)
 			0xb9, 0x00, 0x00,	// [4] LDA $0000, y (no wrap)
+
 			0xb9, 0x10, 0x00,	// [5] LDA $0010, y (wrap)
 			0xa1, 0x44,			// [6] LDA ($44, x)
 			0xb1, 0x00,			// [5] LDA ($00), y (no wrap)
@@ -222,7 +223,7 @@ class MOS6502TimingTests: XCTestCase, CSTestMachineTrapHandler {
 
 	func testMachine(_ testMachine: CSTestMachine, didTrapAtAddress address: UInt16) {
 		if self.endTime == 0 {
-			self.endTime = machine.timestamp - 1
+			self.endTime = (machine.timestamp / 2) - 1
 		}
 	}
 }
diff --git a/OSBindings/Mac/Clock SignalTests/Bridges/TestMachine6502.mm b/OSBindings/Mac/Clock SignalTests/Bridges/TestMachine6502.mm
index a9ad4c69f..50aff4217 100644
--- a/OSBindings/Mac/Clock SignalTests/Bridges/TestMachine6502.mm	
+++ b/OSBindings/Mac/Clock SignalTests/Bridges/TestMachine6502.mm	
@@ -78,7 +78,7 @@ static CPU::MOS6502::Register registerForRegister(CSTestMachine6502Register reg)
 }
 
 - (uint32_t)timestamp {
-	return _processor->get_timestamp();
+	return _processor->get_timestamp().as_int();
 }
 
 - (void)setIrqLine:(BOOL)irqLine {