more tests, optimizations on batcher