added tests
Merge branch 'test_branch'