Fix failing YAML tests