Finally got tests passing and implemented lodash