Added more merge tests...they work!