Fix tests for recent merge