Rr/fixing tests