Code coverage percentage improvement

Changes:
* code coverage percentage improvement
* refactored tests