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