Test: added new unit tests
(cherry picked from commit 8acea76a2b)
Change-Id: I4e6633984075d87c4e22466bc881629436359f7f
Test: added new unit tests
(cherry picked from commit 8acea76a2b)
Change-Id: I4e6633984075d87c4e22466bc881629436359f7f