diff --git a/unitTests/rawTestData/Calculation/Engineering/BIN2DEC.data b/unitTests/rawTestData/Calculation/Engineering/BIN2DEC.data
index 15b88256..74f9159b 100644
--- a/unitTests/rawTestData/Calculation/Engineering/BIN2DEC.data
+++ b/unitTests/rawTestData/Calculation/Engineering/BIN2DEC.data
@@ -1,8 +1,10 @@
-"10110010",	178
-"111001010101",	"#NUM!"
-"101",		5
-"10",		2
-"0",		0
-"21",		"#NUM!"
-TRUE,		"#VALUE!"
-"1110010101",	-107
+"10110010",	"178"
+"1100100",	"100"
+"111001010101",	"#NUM!"		//	Too large
+"101",		"5"
+"10",		"2"
+"0",		"0"
+"21",		"#NUM!"		//	Invalid binary number
+TRUE,		"#VALUE!"	//	Non string
+"1110010101",	"-107"		//	2's Complement
+"1111111111",	"-1"		//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/BIN2HEX.data b/unitTests/rawTestData/Calculation/Engineering/BIN2HEX.data
index 78becf7f..13af46ff 100644
--- a/unitTests/rawTestData/Calculation/Engineering/BIN2HEX.data
+++ b/unitTests/rawTestData/Calculation/Engineering/BIN2HEX.data
@@ -1,8 +1,14 @@
-"10110010",	"B2"
-"111001010101",	"#NUM!"
-"101",		"5"
-"10",		"2"
-"0",		"0"
-"21",		"#NUM!"
-TRUE,		"#VALUE!"
-"1110010101",	"FFFFFFFF95"
+"10110010",		"B2"
+"111001010101",		"#NUM!"		//	Too large
+"11111011",	4,	"00FB"		//	Leading places
+"11111011",	3.75,	"0FB"		//	Leading places as a float
+"11111011",	-1,	"#NUM!"		//	Leading places negative
+"11111011",	"ABC",	"#VALUE!"	//	Leading places non-numeric
+"1110",			"E"
+"101",			"5"
+"10",			"2"
+"0",			"0"
+"21",			"#NUM!"		//	Invalid binary number
+TRUE,			"#VALUE!"	//	Non string
+"1110010101",		"FFFFFFFF95"	//	2's Complement
+"1111111111",		"FFFFFFFFFF"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/BIN2OCT.data b/unitTests/rawTestData/Calculation/Engineering/BIN2OCT.data
index 69d1e44f..fa1f5d5b 100644
--- a/unitTests/rawTestData/Calculation/Engineering/BIN2OCT.data
+++ b/unitTests/rawTestData/Calculation/Engineering/BIN2OCT.data
@@ -1,8 +1,15 @@
-"10110010",	262
-"111001010101",	"#NUM!"
-"101",		5
-"10",		2
-"0",		0
-"21",		"#NUM!"
-TRUE,		"#VALUE!"
-"1110010101",	7777777625
+"1100100",		"144"
+"10110010",		"262"
+"111001010101",		"#NUM!"		//	Too large
+"1001",		3,	"011"		//	Leading places
+"1001",		4.75,	"0011"		//	Leading places as a float
+"1001",		-1,	"#NUM!"		//	Leading places negative
+"1001",		"ABC",	"#VALUE!"	//	Leading places non-numeric
+"00000010",		"2"
+"00000101",		"5"
+"00001101",		"15"
+"0",			"0"
+"21",			"#NUM!"		//	Invalid binary number
+TRUE,			"#VALUE!"	//	Non string
+"1110010101",		"7777777625"	//	2's Complement
+"1111111111",		"7777777777"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/DEC2BIN.data b/unitTests/rawTestData/Calculation/Engineering/DEC2BIN.data
index 751f78d4..403ced63 100644
--- a/unitTests/rawTestData/Calculation/Engineering/DEC2BIN.data
+++ b/unitTests/rawTestData/Calculation/Engineering/DEC2BIN.data
@@ -1,10 +1,16 @@
-357,		"101100101"
-1357,		"#NUM!"
-246,		"11110110"
-12345,		"#NUM!"
-123456789,	"#NUM!"
-123.45,		"1111011"
-0,		"0"
-"3579A",	"#VALUE!"
-TRUE,		"#VALUE!"
--107,		"1110010101"
+357,			"101100101"
+1357,			"#NUM!"		//	Too large
+9,		4,	"1001"
+9,		8,	"00001001"
+9,		6.75,	"001001"	//	Leading places as a float
+9,		-1,	"#NUM!"		//	Leading places negative
+9,		"ABC",	"#VALUE!"	//	Leading places non-numeric
+246,			"11110110"
+12345,			"#NUM!"
+123456789,		"#NUM!"
+123.45,			"1111011"
+0,			"0"
+"3579A",		"#VALUE!"	//	Invalid decimal
+TRUE,			"#VALUE!"	//	Non string
+-100,			"1110011100"	//	2's Complement
+-107,			"1110010101"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/DEC2HEX.data b/unitTests/rawTestData/Calculation/Engineering/DEC2HEX.data
index 736d22c5..d4f033be 100644
--- a/unitTests/rawTestData/Calculation/Engineering/DEC2HEX.data
+++ b/unitTests/rawTestData/Calculation/Engineering/DEC2HEX.data
@@ -1,10 +1,15 @@
-"357",		"165"
-"1357",		"54D"
-"246",		"F6"
-"12345",	"3039"
-"123456789",	"75BCD15"
-"123.45",	"7B"
-"0",		"0"
-"3579A",	"#VALUE!"
-TRUE,		"#VALUE!"
-"-107",		"FFFFFFFF95"
+"357",			"165"
+"1357",			"54D"
+"246",			"F6"
+"12345",		"3039"
+"123456789",		"75BCD15"
+"100",		4,	"0064"
+"100",		5.75,	"00064"		//	Leading places as a float
+"100",		-1,	"#NUM!"		//	Leading places negative
+"100",		"ABC",	"#VALUE!"	//	Leading places non-numeric
+"123.45",		"7B"
+"0",			"0"
+"3579A",		"#VALUE!"	//	Invalid decimal
+TRUE,			"#VALUE!"	//	Non string
+"-54"			"FFFFFFFFCA"	//	2's Complement
+"-107",			"FFFFFFFF95"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/DEC2OCT.data b/unitTests/rawTestData/Calculation/Engineering/DEC2OCT.data
index 6982b049..8a6b3f74 100644
--- a/unitTests/rawTestData/Calculation/Engineering/DEC2OCT.data
+++ b/unitTests/rawTestData/Calculation/Engineering/DEC2OCT.data
@@ -1,10 +1,12 @@
-"357",		"545"
-"1357",		"2515"
-"246",		"366"
-"12345",	"30071"
-"123456789",	"726746425"
-"123.45",	"173"
-"0",		"0"
-"3579A",	"#VALUE!"
-TRUE,		"#VALUE!"
-"-107",		"7777777625"
+"357",			"545"
+"1357",			"2515"
+"246",			"366"
+"12345",		"30071"
+"123456789",		"726746425"
+"123.45",		"173"
+"58,		3,	"072"
+"0",			"0"
+"3579A",		"#VALUE!"	//	Invalid decimal
+TRUE,			"#VALUE!"	//	Non string
+"-100",			"7777777634"	//	2's Complement
+"-107",			"7777777625"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/HEX2BIN.data b/unitTests/rawTestData/Calculation/Engineering/HEX2BIN.data
index 4815ff5c..b4a5e71e 100644
--- a/unitTests/rawTestData/Calculation/Engineering/HEX2BIN.data
+++ b/unitTests/rawTestData/Calculation/Engineering/HEX2BIN.data
@@ -1,10 +1,13 @@
-"01AB",		"110101011"
-"ABCD",		"#NUM!"
-"F6",		"11110110"
-"12345",	"#NUM!"
-"123456789",	"#NUM!"
-"123.45",	"#NUM!"
-"0",		"0"
-"G3579A",	"#NUM!"
-TRUE,		"#VALUE!"
-"-107",		"#NUM!"
+"01AB",			"110101011"
+"ABCD",			"#NUM!"
+"F6",			"11110110"
+"F",		8,	"00001111"
+"B7",			"10110111"
+"12345",		"#NUM!"
+"123456789",		"#NUM!"
+"123.45",		"#NUM!"
+"0",			"0"
+"G3579A",		"#NUM!"
+TRUE,			"#VALUE!"
+"-107",			"#NUM!"
+"FFFFFFFFFF",		"1111111111"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/HEX2DEC.data b/unitTests/rawTestData/Calculation/Engineering/HEX2DEC.data
index f29401eb..84dd3391 100644
--- a/unitTests/rawTestData/Calculation/Engineering/HEX2DEC.data
+++ b/unitTests/rawTestData/Calculation/Engineering/HEX2DEC.data
@@ -8,3 +8,6 @@
 "G3579A",	"#NUM!"
 TRUE,		"#VALUE!"
 "-107",		"#NUM!"
+"A5",		"165"
+"FFFFFFFF5B",	"-165"
+"3DA408B9",	"1034160313"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/HEX2OCT.data b/unitTests/rawTestData/Calculation/Engineering/HEX2OCT.data
index 43bf78f8..c6f52b24 100644
--- a/unitTests/rawTestData/Calculation/Engineering/HEX2OCT.data
+++ b/unitTests/rawTestData/Calculation/Engineering/HEX2OCT.data
@@ -1,10 +1,13 @@
-"01AB",		"653"
-"ABCD",		"125715"
-"F6",		"366"
-"12345",	"221505"
-"123456789",	"#NUM!"
-"123.45",	"#NUM!"
-"0",		"0"
-"G3579A",	"#NUM!"
-TRUE,		"#VALUE!"
-"-107",		"#NUM!"
+"01AB",			"653"
+"ABCD",			"125715"
+"F6",			"366"
+"3B4E",			"35516"
+"F",		3",	"017"
+"12345",		"221505"
+"123456789",		"#NUM!"
+"123.45",		"#NUM!"
+"0",			"0"
+"G3579A",		"#NUM!"
+TRUE,			"#VALUE!"
+"-107",			"#NUM!"
+"FFFFFFFF00",		"7777777400"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/OCT2BIN.data b/unitTests/rawTestData/Calculation/Engineering/OCT2BIN.data
index 0c4f41e1..ebe1edb1 100644
--- a/unitTests/rawTestData/Calculation/Engineering/OCT2BIN.data
+++ b/unitTests/rawTestData/Calculation/Engineering/OCT2BIN.data
@@ -1,7 +1,10 @@
-"1357",		"#NUM!"
-"246",		"10100110"
-"12345",	"#NUM!"
-"123.45",	"#NUM!"
-"0",		"0"
-TRUE,		"#VALUE!"
-"3579",		"#NUM!"
+"1357",			"#NUM!"
+"246",			"10100110"
+"3",		3,	"011"
+"12345",		"#NUM!"
+"123.45",		"#NUM!"
+"0",			"0"
+TRUE,			"#VALUE!"
+"3579",			"#NUM!"
+"7777777000",		"1000000000"	//	2's Complement
+
diff --git a/unitTests/rawTestData/Calculation/Engineering/OCT2DEC.data b/unitTests/rawTestData/Calculation/Engineering/OCT2DEC.data
index ae40123e..d2fb32c9 100644
--- a/unitTests/rawTestData/Calculation/Engineering/OCT2DEC.data
+++ b/unitTests/rawTestData/Calculation/Engineering/OCT2DEC.data
@@ -5,3 +5,5 @@
 "0",		"0"
 TRUE,		"#VALUE!"
 "3579",		"#NUM!"
+"54",		"44"
+"7777777533",	"-165"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/OCT2HEX.data b/unitTests/rawTestData/Calculation/Engineering/OCT2HEX.data
index 82d76651..24771e89 100644
--- a/unitTests/rawTestData/Calculation/Engineering/OCT2HEX.data
+++ b/unitTests/rawTestData/Calculation/Engineering/OCT2HEX.data
@@ -1,7 +1,9 @@
-"1357",		"2EF"
-"246",		"A6"
-"12345",	"14E5"
-"123.45",	"#NUM!"
-"0",		"0"
-TRUE,		"#VALUE!"
-"3579",		"#NUM!"
+"1357",			"2EF"
+"246",			"A6"
+"12345",		"14E5"
+"100",		4,	"0040"
+"123.45",		"#NUM!"
+"0",			"0"
+TRUE,			"#VALUE!"
+"3579",			"#NUM!"
+"7777777533",		"FFFFFFFF5B"	//	2's Complement