Add more tests

Add merge logic.