Tests and fix for #211
Merge branch 'dtfn-squashes-ids' of https://github.com/subhash/pedestal