EDX-391: Change the logic of getting next peer grading contents
EDX-391: Modify unit tests