More changes to try and fix nodeunit