use rspec-mocks rather than mocha

so we can declare assertions in Then
Merge branch 'ye_olde_specs' into extract_transport