fixing macro usages in tests, p.2