fixed failing tests

Change-Id: I4d82f0b97919dc2a7170efabe7c2ad6ba82438a8
Merge "fixed failing tests"