Remove unused comm* prototypes
Add tests for commMock