Refactor dispatching
Add partition subset listening test