cleanup
TESTS 1-4 + 8 OK