Fixing Oracle tests