removed old calculator and calculator_tests -- all tests passing