Updating tests and root/Rx refs