Add code to pass all the tests for Rubric