Improve publisher registry modules
Pass all unit tests