Parameterize test files in makefile.
More readable grid function.