o Make calculator tests pass.
o Not sure if this is correct, but simon_says tests seem to pass.