Fix all failing tests

Change-Id: I0b04ff27fbd5448744810752e82fdff65ce9947f