Refactor fixtures