Redmine #2778: oops, rename the sub tests back