fix test + format