Improve some func. tests variables naming