Reorder testcase classes to match MUT.
Add explicit coverage for s.principal.DefaultUserLoogkup.