Fix some tests
am: 65bc46b3b5

Change-Id: Ia69823e300761778ff720fd62bfbd3e37948a999