Fix to unit test fail that is timing issue.