OZP-153 WidgetDefinition tests and service fixes