Adding a few more tests to etcd inventory

plus additionally replacing dashes in keys, and always lowercasing keys.