Cleaner formatting

@dxg - note, the test/db-run test level still does not work for me. The regular test/db string checking does, however.

I think we should overhaul the integration layer testing when there's a moment. It just isn't intuitive and it seems too error prone.