End of chapter exercises - test-cleanup