lot of refactoring
more Tests
new DeleteTest's