Rubric Tester Improvements