Well that was part of our discussions. It worked really well in making the tests work well, and I really like using this approach in the examples as well - so it makes sense to move it.