Changes in tests configuration, small refactoring of `User()`