Updated fixtures to use models