Added new tests
Refactored create grid method