removes confusing "Test" suffixes