Re #7235 remove old tests