The first cut in adding 'with' clauses to tests. This is just a handful of tests that I have come across so far.