Fix tests failing