meta and test cleanups

These are just a few random cleanups I noticed were needed.  This
updates the gemspec to get on the latest dependencies and conventions.
This also updates a few random test files that were not up to
convention.

No behavior changes, just a few cleanups.

/cc @jcredding