Cleaning up calculator tests