diff --git a/Programs/testPrograms/mathTest.asm b/Programs/testPrograms/mathTest.asm
index 42b17d2..4763410 100644
--- a/Programs/testPrograms/mathTest.asm
+++ b/Programs/testPrograms/mathTest.asm
@@ -1,21 +1,25 @@
 ; A test for the new math subroutines.
 
 #Include ../Libraries/print.asm
-#Include ../Libraries/math.asm
+#Include ../Libraries/int8.asm
+#Include ../Libraries/int16.asm
 
 #Program
  start:
   SETD SomeInt16Operands
-  CALL int16sub
-  BRC end
+  CALL int16div
+  LDA
+  CALL printByteHex
+  INCD
+  LDA
+  CALL printByteHex
+  CALL blankSpace
+  INCD
   LDA
   CALL printByteHex
   INCD
   LDA
   CALL printByteHex
-  INIA 0x3A
-  OUTA 0x00
-  BRI start
  end:
   CALL lineFeed
   HALT
@@ -23,5 +27,5 @@
 #Data
 
 SomeInt16Operands:
-  0xFF 0xFF
-  0x00 0x01
+  0x01 0xF4
+  0x00 0x0A
diff --git a/Programs/testPrograms/printDecimalTest.asm b/Programs/testPrograms/printDecimalTest.asm
index cffdf98..fec9c57 100644
--- a/Programs/testPrograms/printDecimalTest.asm
+++ b/Programs/testPrograms/printDecimalTest.asm
@@ -3,17 +3,15 @@
 #Program
 
 printByteDecimalTest:
-  INIB 0xFF                 ; Load 255 into B.
+  INIB 0xFF   ; Load 255 into B.
  printDecimalTestloop:
-  SUB
-  CCF                       ; Clear the Carry Flag.
-  CALL printByteDecimal         ; Print the value.
-  INCA                      ; Increment it.
-  PSHA
-  INIA 0x00
+ ; Print A and a blank space.
+  CALL printByteDecimal
   CALL blankSpace
-  POPA
-  BRQ printDecimalTestend                   ; If Q is zero, we're done.
+  INCA    ; Increment A.
+  DECB    ; Decrement B.
+  ; If B underflows, we're done.
+  BRC printDecimalTestend
   BRI printDecimalTestloop  ; Branch back to the start of the loop.
  printDecimalTestend:
   CALL lineFeed
diff --git a/Programs/testPrograms/printDigitTest.asm b/Programs/testPrograms/printDigitTest.asm
index b36c0fa..beeb73f 100644
--- a/Programs/testPrograms/printDigitTest.asm
+++ b/Programs/testPrograms/printDigitTest.asm
@@ -8,7 +8,7 @@ printDigitTest:
   SUB
   CCF
   BRQ printDigitTestend
-  CALL lineFeed
+  CALL blankSpace
   BRI printDigitTestLoop
  printDigitTestend:
   CALL lineFeed
diff --git a/Programs/testPrograms/printHexTest.asm b/Programs/testPrograms/printHexTest.asm
index 650f9bb..b1fcc61 100644
--- a/Programs/testPrograms/printHexTest.asm
+++ b/Programs/testPrograms/printHexTest.asm
@@ -2,18 +2,14 @@
 
 #Program
  printByteHexTest:
+  RSTA
   INIB 0xFF
-  CALL printByteHex
  printHexTestLoop:
-  PSHA
-  INIA 0x00
-  CALL blankSpace
-  POPA
-  INCA
-  SUB
-  CCF
   CALL printByteHex
-  BRQ printHexTestend
+  CALL blankSpace
+  INCA
+  DECB
+  BRC printHexTestend
   BRI printHexTestLoop
   printHexTestend:
   CALL lineFeed