More fixes to make all auth tests pass correctly