Better tests for Exercises 2 and 3