Fix for nil comparison in string
Update unit tests to check for nil comparison