Beginning better tests of the calculator functions