re-organized test files