Sync tests with changes in previous commit.