added CHECK_TYPE directive to diagnostic tests
Buildserver auto merge