Temporarily disable two failing legacy tests