fixture/test refactor