Support for multiple sender's IDs implemented with more integration tests