fix for macro unit tests