Improved tests for exercise 8