A few more merge unit tests + bug fixes.