Updated gridded colocation tests to work with changes made for ungridded aggregation.