Fix tests after 1327eb4a0aa12e7a7d5a18cbeed033c69935986f