Organize imports and add some comments in test cases