added unit tests

Change-Id: I7d7d25fd98e33954f8109911ecf076573f5617dd