Grid columns clean up

- Cleaned up grid columns implementation and tests.
- Increased grid columns tests coverage.