Remove test includes, not used
Reognanize tests into subdirectories