Clean-ups and CourseEnrolledUser deprecation.
Tests updated for 2.7
Updated for new direcotry structure in tests.