reorgnize test files