Fix for failing tests on oracle (multi tenancy) - part 2