Fix RR service test because of datastore refactor revert