testrig extended + better batching
Merge pull request #61 from pdelbar/master

testrig extended + better batching