Fix tests

Change-Id: I6e552dc14720c46021c27271f6d6ee6e9ca9831d