fix and tests for NODE-98