Updated grader.js and move to test dir