Remove #include
Add TestFormatter to TestBatch constructor
Remove 'vself' hack from TestBatch and TestFormatter