added a test
Merge branch 'test_branch'