recent changes made more oracle tests succeed