Aye, initially I only intended it for service tests, but then later found it needed in the functional tests that access the database for validation or cleanup.  Fixed