[tvp] Improve and add new extractor

Yes, but the tests fail as soon as anything fails, even if it's just a warning for the user.