Clean users more aggressively for tests

As I have seen, it's easy to end up with test users in incomplete state and the users are shared across tests.  This addresses the problem by delete the users more aggressively.