Rename and optimize tests (#3816)