Fixing test that were broken by the merge.