Fix fixture functions