spec cleanup

@localshred this PR tightens the specs up a bit. It also cleans up a few straggling RSpec 3 deprecations.