#40: final bits of new tests for merging