Merge with content-zach: refactor CourseService, test, and CourseCtrl