Yogesh | #2784 | added unit test