Bug 1431

Ulepszone (chyba) testy

https://gist.github.com/gruber86/7675fa7ad6f27ee562ce