fix failing specs for upgrade