Fixed testing failures I accidentally introduced when showing a better naming for machine generated names (so that I could better debug)