SupportTest: Fix test names harder