Once more: reduce complexity of GeneratorsTest and BatchTest