Add more testing and finish grader