#556 repair tests