Fixes for batch runner test