Add widgets test
Add more tests for storage and data