added comprehensive test set for grade