add etcd for tests
rename imports