Fix GridTests