Added tests for several modular NameFix cases (currently not including conflict handling!)