I have decided to keep with the idea of having a fix_imports2 separate from fix_imports, so after finishing the usage parts of fix_imports_test, I have declared it finished and ready for general usage. It has replaced the old fix_imports.
fix_imports2 will be another rewrite, so I will go ahead and start on that eventually.