Passing all unit tests
Replacing the split with a map of str