Feature/test coverage improvement