Added new macros from test module.