Fix tests for changes in previous commit.