Final commit. Added more test for Grid.