Bring back iml files and fix UT failures.