Remove shoulda - was breaking 1.8 compat