- Added functionality for delete/test buttons;
- set of fixes