Update tests to work with new helper for user name formatting, cleanup