Makefile fixes (gfortran/pgi), Rearrange hexagon test case