file shuffle.
starting to put in gateway tests, refs #51.