Fixed broken tests

Change-Id: I8bb63f0d13695c1af969e59ed0b5daf7ef44988d