WIP: begin to dedup/consolidate InferTests