Fixes tests to work with new user nam fields.