Adapt tests to %h = { ... } now being deprecated