Fix tests assuming old behavior