Fix test errors (#4144)