Fix tests that broke as a result of a merge