fix tests by improving singleStatisticMap creation lifecycle