Cleqanup of test code