Adding unit tests

(cherry picked from commit 781baa10586c4da09e48e4ecb953892efcb6c3b9)
3 files changed