Fix test issues with username formatting pr