remove unused import.
Fix failing tests. tweak dir.locals