Try fixing BatchTest