Add tests and condition for Grade Normal condition