Add null and emptystring tests to check NOT NULL