Update widget name
Update test
Add more widget types