Temp fix for test failures.