* Added underscore dependency in test
* Replaced incompatible array and string function calls with underscore equivalents