course message -> more cleanup + proper comments in test file