Simplify testing name convention