Tweak fixtures to reflect new structure.