Fixed failing specs