more tests for courses, along with some found bugfixes