reformat, fixed tests