unit merge test improvements