Added clean up tests