Update tests

Change-Id: I3dea59b4a48363ea59fa9d9542ce4a57f1871034