Fix failing tests

Guys, your tests are failing. :-( I can't submit my other patch
because of this.

Change-Id: Ibba5b07205fd45edb73f562c9ca9429487dacafa