fix rp tests
improve null-safety of rp location selection