better batch testing setup