fix tests after merge

Thanks for merging all the PRs.
Some tests need changes because of the PR's interlocked nature.