Delete bad integration tests.
Support both new and old formatter APIs

Ref #745