Revert the revised macros used in developing the new tests.