New unit test & macro