Switched Set to Create in etcd tools

Also adjusted some tests to make them pass.