- Refactored to remove unnecessary parameter and vaadin leaked mock type in macro