Revised feature testing variables to reduce repetition