added unit tests

Change-Id: Idfc2b9c55a4e0a685c8929e5a476d423e431f839