Fix broken tests on master

Not sure how the failures got through the gate...

Change-Id: I8a214917eb5e9244ebdbe9e4400a2a2f9cfe2b02