P.P.S. After looking at the test I see why it's a singleton. This is like a global event bus.  I get it.  Disregard that part of the comment.