Added tests for --merge.