Added grader and testing