Minor efficiency tweak.
Move some logging into this test class, from VBF.