Minor Oracle improvments, improved array merge, fixing tests