Added DELETE test method
Improved the user interface
Code cleanup