Fix failing specs 2