Fix good tests failing