Ajay | #3253 | Added unit tests