Added test to choose whether or not to use packaged grid sets