Merge "Fixed groovy testing pipeline"