Update for automatic testhost