Re-organized test files