Merge "Add map register and rloc probe tests"