Added a test in testbranch
Merge branch 'master'