remove the quoted-string keys from list of keys with :simple formatting
Fix unit tests