[core] Try to fix failing specs