changed calculator
fixed test