Added unit tests for new macros