Updated some code for the calculator to test.