Fix YAML tests again.