#561 YAML validation tests
#570 fixes
#570 fixes