JAL-4107 fix test compilation issues