Update for ssh based tests