Add widget
Fix test case