Simplified variables with tests