Gradle 2.0 adoption unit tests fixes