* renamed some widgets
* added new test