Fix tests

Change-Id: I91e1430ee6a5e2d4107fc2cc79117dcfba2da596
3 files changed