Add courseId change and add a test

This change makes the course_id a requirement to stop guessing it from the usageId. As noticed, the usage_id doesn't always contain the course_id.