delete tests and refactoring