TST/BUG: fixed double escaping, added test for add dict thing