Add tests to #merge