Minor improvements, added testing references to build.gradle

Change-Id: I74a6a758035faa4d30c626e0007facd2aba0901e
2 files changed