Added Student progress test
Completed test
resolved merge conflicts
Fixing merge conflicts