transpec

This updates the specs to use rspec's expect syntax. @robolson 

@yujinakayama, is changing the block passed to and_return from do-end to {} like I do here correct?