tests and modification of files to have right tests