Updated to add/remove string modifiers correctly
Fixed tests that were broken by turning each string value into a hash