fixed merge conflicts, broken tests, deleted generated tests. signing up routes to successful sign up page.