Fix and modernize specs

No change to functionality or test coverage, but specs now PASS and
do not give any deprecation warnings.
Merge pull request #10 from philipmw/fix-and-modernize-specs

Fix and modernize specs