Initial ideas for test cleanup