testrig extended + better batching