Add etcd file
Fix helpers. There was a weird issue where previous tests were lost and
were not passing properly here.