Re: psapi/tests: macro cleanup