Updated grading and tests