Reuse setup and make visibility spec future proof
Make the specs future proof