Merge "Fixing grid migration test and adding extra tests to cover one grid updates" into main