Moved Cleanups from test to teardown