Adapt Oracle test #89 #366 #364