Add smart formatting to import removing to match test