Fix instructor_task and bulk_email tests.