dependencies fix and adding tests
Merge origin/master