Merge
Add test case