Added some cleanup to tearDown