Node 98

fix and some tests for https://jira.mongodb.org/browse/NODE-98