fixture refactor