Fix tests

Change-Id: I3b67fc2d41591d2861e3115742b587b2cd63647c
3 files changed