Added tests, missing grading scheme