Fixed test issues
Fixed RR argument name issue