[#516] Improving coverage