[3818] Zwiększenie pokrycia testami.

https://gist.github.com/lukkolstx/bd8e4a7df17657f4a60d
This will change after previous improvements and style is bad :suspect: