Neither of these sound right to me.
The teacher graded John's test and awarded him an A. John's grade was an A on the test.
That teacher is a hard grader - make one spelling mistake and expect to drop 5 points.
His promotion bumped him up two salary grades.
His new salary grade is quite a bit higher than his old one.