Fix EDOZWO-353
- adds delete Test
- unifies listing and deletion