More merge fixes
Updating tests.