Moving message broadcaster to instantiable object and adding unit tests