Fix failing tests from bad merge.