Get rid of race conditions in spec