tests: reorganized test files little bit