Added local grid and test for it