Test cleanup.

--HG--
extra : source : 209ede80b92d1a3cb3589d1971284a87a33d41c4
upgrade shoulda 2.11

--HG--
extra : source : e5db8fcdd87ce5bccf7993575852662bc08440cd