Fix for failing tests on oracle (multi tenancy)