bunch of changes to get tests to pass
Finish sign in