added tests
Merge branch 'dev'