Fix Tests

Change-Id: Id82f6ead1673f8c3a94fc482682bfdbbdab11897
8 files changed