added tests for calculator