Fixed some failing specs