Added unit tests

Change-Id: I11d87244662bd21a164f48716be23f532fd1c718
Signed-off-by: Liem Nguyen <liem_m_nguyen@hp.com>
Merge "Added unit tests"