fix failing specs after merge