Cleaning up GFK test module.  Refs #607.