reorganized the tests (end of Chapter 11)