Fix references to `null` and improve assertion test
Merge pull request #3 from mscdex/master

Fix references to `null` and improve assertion test