test-widget: continue the code improvements