WIP refactor fixtures