Refs #4319 - Readjust classes to check. All classes created are checked now