Move clean up code to tearDown