Remove conditional added during testing
Fix tests for multi-version FFmpeg support