GROOVY-5011: commented out solution sketch
checkstyle
Fixed broken unit tests