Restore tests that depend on promote_type