Merge "Refactor datarate svc test."