refactored to use mxunit-call macrodef