Fix more of the locator tests, before simplifying the constructor
Fix more xmodule tests
Simplify CourseLocator constructor