Functional test improvements

Not sure this was a worthwhile change in retrospect.  Just thought it would be good to split out things related to logging utilties.