Tests refactored to use rspec 3

@bf4, can you take a look to this ?