Fix peer grading tests
Fix capa tests
Fix conditional tests
Fix more tests
Fix more tests