Removed test-related files
Better thread order