Added tests for merge