Test classes renamed
conflictr solved