added more unit tests

Change-Id: I694c7a165dde4fdf8aacba8a06f1196ca20a462d