PIM-1526 : Make some refactoring on UniqueVariantAxisValidator