Fixed tests for recent changes.