Ready for fixture generation refactor.