utility macros; test cleanup