[#2829] Improved test template method names