updated to yaml files and added tests