Fix tuple formatting in dictionary
Add some fuzzy tests