new user format change and fixed test to pass