refactor to add test for new user onboarding