Fixing gradle and some tests

Change-Id: Ied44ab475a30058f19387e843ce113b3028c1bd5
2 files changed