Try again to fix tests that fail due to addition of 'Core' header.