fixes for tests on JAI check