Revamp auth message and work towards getting auth unit test to succeed