[VeeHD] Enhance extraction and fix tests (fixes #4965)