Existing UTs working except RR headers have changed