Fix BatchSubscriber and adding testcase