Update tests

Change-Id: Ifa23dc03b033fc70179c652b3cf1f7758fe71136