Support running test cases without certain users

Perform test clean up more effectively - don't assume users are present.

[merge]