Refactoring to make it harder to create then not delete a user via the test helper