Utsab, Neha | #BDSHR-148 | Adding tests.
Neha, Angshu | Added handlers.