Renamed a couple of tests
Rewrote merge functions