Cleanup of test... (Part 1)