Pari testia lisatty. Refaktorointia