Merge "Fix jit tests"