Grid bug fixes and test updates