removed commented tests and refactored