fixed batch runner and tests