Minor tweaks
Merge pull request #501 from kevva/minor-fixes

Minor tweaks
Revert: Uses null default instead of undefined.
Commit: 3b2c495464381a2288a72b21c36f6c4d5060dea6.
Merge pull request #502 from am11/master

Revert: Uses null default instead of undefined
Fixes windows compilation to pass all unit tests
Adds more unit tests