Tests only g1fix

This branch is based on the g1fix branch, and has been interactively rebased to fludagwork, selecting the tests commits.

At this point the only commit from g1fix that is not included is the commit from fludagwork_doc.