Nearly full test coverage and move from Hpricot to Nokogiri complete