fix tests
create a more generic grid