fixed remaining batch test failures