Revert "Switched to manually loading"

This reverts commit e6dcd5e2f021fb056eb0e45eb2887e81a0d5b341.
fixup! New tests for SimpleAuthHandler