Add diagnostic checks for indicators for 6th and 7th grade.
Fix white space.