And add tests for empty string & null