testlib; improve styling
testlib; fix possible bug in macro

Always add parentheses around expresions.