Add remaining unconventially named checks to CheckResult refactor