fixing macro usages in tests