Switch back to the old hash syntax

Just fixed up a couple of hash literals in the tests so that the build
passes for 1.8.7
Merge pull request #278 from vanstee/use-old-hash-syntax

Fix the build in 1.8.7