Correct the implementation of the subscribers and its tests as well.