[bug-fix] Make several tests work again

Change-Id: I63478b7514ae371e9141f216e734780b6691912a