Enabling some tests for batch