fixes for node
WIP test updats
tests