Fix tests post-#5121