* Add missing require to files * Remove dead code and ensure values are strings before calling gsub * Fix failing tests on 3-2-stable branch