add batchtest back in