underscore helper fixed & new tests added