add rubrics and test