More test for improving of code coverage + test refactoring