Fix broken tests following re-design.