reformat testing and minor cleanup