refactor ListOfStrinsgAndDictOfStrings code
extend test cases