fixing test failures in the merge