add unittests

Change-Id: I171bb7538b48085beed453e062e188ca32a0cf07
Merge "add unittests"