Added test and fix for strings being handled as iterables and throwing an exception when changed to None