Fixed racy tests