Refactoring example mock to require less provision wrangling, and removed CrossFilter class as its now in stdlib