[TASK] Improve test suite
Merge pull request #321 from NamelessCoder/tests

[TASK] Improve tests