Fix tests broken in ddae849