Minor changes in the macros to be used by the tests