Merge "Switch all RoR CTS tests to server based"