Refactoring to a decorator pattern for the message processors and added a ton of unit tests to specify the feature.