Improve tests names and readability