Fixing underscore dependency and starting to write unit tests