Move tests to control server now that it has a route