Updated Grid Unit Tests