fixes for tests on JAI check
conflic fix