More progress on re-synchronizing unittests with code drift. Next: modulestore test.