Minor tweaks
Merge remote-tracking branch 'origin/courseviz' into courseviz
Added fresh test cases, minor tweaks to course