Working on solutiions for race conditions in the testing