ADDED LAST TESTS
Merge https://github.com/asm2500/malakhov