More fixes to spec fixtures