Pull all Stubby-related traits together in one file
Cleanup after traits refactor
Added new assertions about exchanges, not just incoming requests