fix `test_conditional`, add new conditional to "conditional_and_poll" test course
fix `test_conditional`, add new conditional to "conditional_and_poll" test course

bmedx/modulestore,bmedx/modulestore,bmedx/modulestore