corrected async, broke apart tests