Merge pull request #2602 from kbrunham-intel/fix/2579 Split formatter_test.cc into concern-based test files