Switch tests to new hspec 2.0 style