Updated the specs to use the newer Ruby syntax (lots of other places still to do, but it is a start