adjust calculator tests
Merge pull request #159247 from mauk81/fixTests

adjust calculator tests