reorgnized test files