UI User model tests fixes #41