sort and format
fix unit test failure