Further strictifying of robot-name tests