Reorganization/update of test files