basic testing working
more tests for complicated merging