Tests are supplemented and refactored