add more unit tests

Change-Id: Id3c831fdfca03b5b70786d993e9c6bc78b3bf0fd