Reformat Test Classes