Rename VIP as NonVisible
Allow NonVisible feature with restricted_visibility disabled
Refactor tests to match the increased combinations