Don't try to authenticate unless we have some credentials
Add TODO/FIXME
Fix ZTS