refactoring
added new test`s