blame code reorganization, and mutting the test
11 files changed