tests: manually move some extra_files into *.T files