Fix broken tests on redesign branch.