Better descriptions + expecting two assertions
Merge remote-tracking branch 'origin/alm-1' into alm-1

Conflicts:
	test/alm-course_test.js