fix(ssh): fix tests, further cleanup for simplification