Feature/improve test coverage