Final conversion of old tests