Avoid breaking core tests