Fix GradleDependencyBuilder and tests