Rename yaml test fixtures: *.yaml -> *.yml
Tests and fixes for utils