Minor improvements
Minor in .iml
Comment out test