added unit tests

Change-Id: I8469727bdc2e820a17adfa3f655c3515c0140215