Finish the Auth refactor, update unit tests