testlib; use better names for macro parameters