Further contributions to un-sad Travis (#56), modernize tests.

Particularly to deal with the "should" -> "expect" syntax change
in rspec 3.