Reorganise test samples and update test_file.cpp