Improve some tests files
Better naming