Fix tests failing after merge