Merge "Create test for default grid" into tm-qpr-dev