Removed the tests from calculator