Updated unit tests

Change-Id: I92638b36b212d69f55539bad124faec99ee84e5a
Merge "Updated unit tests" into fb-test1