Resolved merge conflicts in students.tests