Adding asserts for get_text value not being the same as the key, and fix...

...ing merge