This is the first part of the login work we need to fix the unittests to run now