reformat some tests