Add GridComparator and rename test snaps