added underscore
updated tests
refactor
yaml is parsed