Modifying the test to be more resilient and clean up better after itself