Update tests

Change-Id: Ibef9f0ab582dc9c936f5fbd2b541a7e4cc422491