tuned yaml and dump functions to the new key format, re-generated the testkeys