Added tests for entire calculator