Fix tests after b8e73d1cb09