Fixes (iptest), simplified v1, v2, .. , vX import code