Fix test failure due to racing commits