Feature/code coverage