Remove macro UT_ADD_TEST, use function instead. Removed trailing underscore in its name