ADD: changes to possibly make unit test run correctly

Change-Id: I260e02ae384a832ce7f5a498653552f701f5b5cd