Modified gradle build to use 'AndroidBuild test' correctly + some tests with output