don’t include inflector tests
misc cleanup
Merge pull request #2118 from stefanpenner/cleanup

Cleanup