WINDUP-380: A little bit cleanup for groovy part
WINDUP-380: Add tests for the groovy part