Fixes unit test for merge