Converted Ruby 1.9 style hashes to 1.8 style & fixed specs