Refactor/fixture api