rename test files to be more organizes