Added trace to hunt down stalled build issue
Spockified and improved coverage

Added coverage for null params.
GRADLE-3190 Hanging build problem with TestNG parallel

Tidy-ups are pending