Merge "Clean up AuthManagerTest a bit"