add another renum unittest +code cleanup