Chore/improve coverage