Reorganized test directory in order to make unittest and PyCharm test runners able to discover tests automatically.