Feature/improve coverage