Readd tests files, merge deleted them