Fixed live test service names
Define update_handle params and catch Timeout in a single place