Improve Races tests