Clean up tests for nicer installation