Fix tests for recent changes