fix failing specs in core