Feature/increase coverage