Try to fix test that fails due to addition of 'Core' header.