updating caching tests to include is_available_via_ssh?, fixing bugs exposed by tests
fixing indentation issues