Move macro out of namespace
Restructure test expressions to include what’s being evaluated