Adding some tests, no more repeated names with no ML change