WIP: more tests, need to check course ids