Start replacing some non-idiomatic uses of nil?

[markwoodhall]

This pull request replaces some non-idiomatic uses of nil, where valuable some new unit tests have been added.