Fix tests, address review feedback
Fix staff grading test
Pep8 and pylint fixes