Fix tests after last commit