Adjust tests for recent API fixes.