That sounds good. I will fine-tune this as I convert more tests, and eventually will move the polished utilities to a shared file so that other tests can benefit.