Previous commit broke building OCE tests, try to fix them