LOADUI-600 Continuation of refactoring of groovy tests