[Brain/Pooja]: Add logic to batch question
[Brain/Pooja]:Fixing some functionsl tests