Fixed two test failures under Oracle