Rejigged tests so they're relevent

CycleTimeQueryFactory Tests were duplicating coverage from the Matchers