Pooja/Ajay | #2683 | Added tests