Fixed Unit Tests [DELETE and POST methods are supported and some refactoring)