improve test + formatting