updated to yaml files and added tests
fixing the mapping file