moved Strings to fields, extra test cases, null check