Slight changes to calc test