Change to GetValueOrDefault

For issues #2, #1
Add tests for null and empty string vs. default

For issue #2