updated to yaml files and added tests
fixing the mapping file
allow data to populate both top level and dept level