added a lot a failing tests
fixed failing tests
added one test
added one test
Merge branch 'master' into graph
merge