refactor to simplify fixture registration