Test fixes to catch up with the latest changes.
4 files changed