Fixed a warning in UNITTEST macro
Merge branch 'pr/3'