Merge "build.gradle - added tests config, cosmetic changes."