JAL-3285 fix errors in tests introduced by merge