Fix tests from previous commits.