Fixed yaml
Added tests fixed bugs