Rename YAML files
Use tmp dir
Fix test