Calculator: Fix failing tests.