Increasing tests coverage