Added some more tests
Merge https://github.com/asm2500/malakhov