Testing with proper etcd server configuration and fixes for the supervisor config