Fix tests according to code review.