Clean users more aggressively for tests