Fixed issues with cleaning up between tests