A little cleaning up
Improve test files organisation