Adapt tests (#3522)