Fix tests failing after [86ca84ddc]