Improve tests for Yaml