[TASK] Further improve tests
Merge pull request #211 from NamelessCoder/tests

[TASK] Further improve tests