Clean up tests

Clean up tests