Better user model behavior and test teardown