Reformat test file name scheme to allow test autodiscovery