Added in a more sophisticated calculator test based on the binary operator expressions test.