#14 Increasing tests coverage