Bug fixed, tests added

Simple fix, new tests added to cover it
merge JerettS: Bug fixed, tests added

Merge pull request #74 from JerettS/sql-layer-client-tools/NullExpandedBug
https://github.com/FoundationDB/sql-layer-client-tools/pull/74