Fix tests for the recent changes.
3 files changed