Calculator now supports all tests