Add GRIB support and start to address test failures