testlib; revert to more readable macros