Test fixes now that we now %h = {} won't work