Attempting to get multiple run test cleaning up properly