Reformat rest of spec tests