Fixed Calculator to pass all tests