Properly remove Underscore and fix tests