More tests
New merge error handling