Fix + tests
Fix + test + rm spec/config.yml