Added more tests for Grid