Fix tests after changes from #12598