GRADLE-2075 Fixing tests