Move the grid drawing to the testcase1
Organize testcases