Update

Updated the student and marker files and fixed the testing scripts