updated tests to include grid refactoring