Rspec 3 x

Basically this is all the changes required to make tests pass again.