XD-620 Refactor test cases to move away from inheritance model of utility methods for streams, counters