Added course and batch tests