updating tests to work with the new user flow
updating server side to work with the new user flow
updating front end to work with the new user flow