adding tests for merge