towards a contained test suite with no system state side effects

Here is a quick snapshot of my current work.
Wrap, same constraints as above.