Tests tuning
Fix permitting of multi-version gavs
Tests tuning