[tests][xs]: tiny tweaks to tests to correct breakages (primarily timeouts).