improve underscore stub
add tests