clean unused imports and set comments in test