Merge pull request #172 from c-eg/fix-test-check-for-null-fields

Merge pull request #172 from c-eg/fix-test-check-for-null-fields #89