Refactoring. Cleanly separate acceptance test clients in RTM and ROS.