Unit test updates and changes

Change-Id: I3b0cad4f72b956120c9dc64cde0c92c32055da8a