Updated Tests to fix async issues.