Fix test failures from redesign changes

Somehow macros overlapped with output.  Fixes test failures.