fix tests

Change-Id: I38883e697fdd18a060216648a4ac6822ddbd5d32
Merge remote-tracking branch 'upstream/master'