Fix for tests temporarily disabled.