Exq.Manager supervisor + test refactoring