Improve Widget test