Completed all the tests for the Calculator DSL