First 138 tests in GridTest green

Change-Id: I6aaab5a42316796bc6955a3310a54c5598664966