Testfix

Testfix and underscore.string dependency