Fix test failures after the strict comparison changes.