course-message

-Some cleanup of unit tests.