refactor fixtures