Complete renaming by changing import in tests